Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extend regex for determining arch from URL #445

Merged
merged 3 commits into from
Sep 11, 2023

Conversation

mdanish-kh
Copy link
Contributor

@mdanish-kh mdanish-kh commented Sep 10, 2023

Also removed a redundant call to GetArchFromUrl function

winget-pkgs examples

  • amd64 pattern (Total: 2567 examples)
j\JanDeDobbeleer\OhMyPosh\10.1.0\JanDeDobbeleer.OhMyPosh.installer.yaml:  InstallerUrl: https://github.com/JanDeDobbeleer/oh-my-posh/releases/download/v10.1.0/install-amd64.exe
b\BellSoft\LibericaJDK\11\11.0.9.11\BellSoft.LibericaJDK.11.installer.yaml:  InstallerUrl: https://download.bell-sw.com/java/11.0.9+11/bellsoft-jdk11.0.9+11-windows-amd64.msi
h\Helm\Helm\3.12.0\Helm.Helm.installer.yaml:  InstallerUrl: https://get.helm.sh/helm-v3.12.0-windows-amd64.zip

full_output_amd64.txt

  • \b386\b pattern (Total: 1013 examples)
g\GoLang\Go\1.17.2\GoLang.Go.installer.yaml:  InstallerUrl: https://dl.google.com/go/go1.17.2.windows-386.msi
c\Cloudflare\cloudflared\2023.8.1\Cloudflare.cloudflared.installer.yaml:  InstallerUrl: https://github.com/cloudflare/cloudflared/releases/download/2023.8.1/cloudflared-windows-386.msi
d\DigitalOcean\Doctl\1.96.0\DigitalOcean.Doctl.installer.yaml:  InstallerUrl: https://github.com/digitalocean/doctl/releases/download/v1.96.0/doctl-1.96.0-windows-386.zip

full_output_386.txt

  • i386 pattern (Total: 156 examples)
t\twpayne\chezmoi\2.33.0\twpayne.chezmoi.installer.yaml:  InstallerUrl: https://github.com/twpayne/chezmoi/releases/download/v2.33.0/chezmoi_2.33.0_windows_i386.zip
q\Qalculate\Qalculate\4.8.0\Qalculate.Qalculate.installer.yaml:  InstallerUrl: https://github.com/Qalculate/libqalculate/releases/download/v4.8.0/qalculate-4.8.0-i386.msi
a\alexx2000\DoubleCommander\1.0.8\alexx2000.DoubleCommander.installer.yaml:  InstallerUrl: https://github.com/doublecmd/doublecmd/releases/download/v1.0.8/doublecmd-1.0.8.i386-win32.msi

full_output_i386.txt

  • armv[567] pattern (Total: 32 examples)
m\muesli\duf\0.8.1\muesli.duf.installer.yaml:  InstallerUrl: https://github.com/muesli/duf/releases/download/v0.8.1/duf_0.8.1_Windows_armv7.zip
n\nektos\act\0.2.48\nektos.act.installer.yaml:  InstallerUrl: https://github.com/nektos/act/releases/download/v0.2.48/act_Windows_armv7.zip
j\JesseDuffield\lazygit\0.40.0\JesseDuffield.lazygit.installer.yaml:  InstallerUrl: https://github.com/jesseduffield/lazygit/releases/download/v0.40.0/lazygit_0.40.0_Windows_armv6.zip

full_output_armv567.txt


Microsoft Reviewers: Open in CodeFlow

@mdanish-kh mdanish-kh requested a review from a team as a code owner September 10, 2023 15:09
@mdanish-kh mdanish-kh requested review from yao-msft and ryfu-msft and removed request for a team September 10, 2023 15:09
@ryfu-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ryfu-msft
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ryfu-msft ryfu-msft merged commit e4d79b3 into microsoft:main Sep 11, 2023
4 checks passed
@mdanish-kh mdanish-kh deleted the regexPatterns branch September 11, 2023 23:55
matifali added a commit to coder/coder that referenced this pull request Dec 5, 2023
`wingetcreate` does not need architecture override as it now supports parsing the URL for `amd64` and correctly marking it as x64 architecture. 

Reference: 
1. https://github.com/microsoft/winget-create/blob/08baf0e61e62dabcb2487397984fc69fad6a7499/src/WingetCreateCore/Common/PackageParser.cs#L594C56-L594C61
2. PR: microsoft/winget-create#445
2. This has been available since version https://github.com/microsoft/winget-create/releases/tag/v1.5.3.0
matifali added a commit to coder/coder that referenced this pull request Dec 5, 2023
* ci: add arm64 and amd64 portable binaries to winget 

This PR updates `release.yaml` workflow to automate updates for `arm64` and `x64` zip installers to winget. This has recently been merged into [winget](microsoft/winget-pkgs#129175).

Thanks to @mdanish-kh for the upstream PR.

* fixup!

* remove extra `--urls` flags

* remove architecture override.

`wingetcreate` does not need architecture override as it now supports parsing the URL for `amd64` and correctly marking it as x64 architecture. 

Reference: 
1. https://github.com/microsoft/winget-create/blob/08baf0e61e62dabcb2487397984fc69fad6a7499/src/WingetCreateCore/Common/PackageParser.cs#L594C56-L594C61
2. PR: microsoft/winget-create#445
2. This has been available since version https://github.com/microsoft/winget-create/releases/tag/v1.5.3.0

* fixup!

* Update release.yaml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants