From 4272e96e754c5c85ed0b434a1fa71edd912535d2 Mon Sep 17 00:00:00 2001 From: 4513ECHO <4513echo@gmail.com> Date: Sat, 12 Feb 2022 11:50:03 +0900 Subject: [PATCH 1/4] fix: Fix shellcheck asset pattern for arm64 --- registry.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/registry.yaml b/registry.yaml index dcdd860fd50..1694b65e412 100644 --- a/registry.yaml +++ b/registry.yaml @@ -2109,8 +2109,11 @@ packages: - type: github_release repo_owner: koalaman repo_name: shellcheck - asset: "shellcheck-{{.Version}}.{{.OS}}.x86_64.tar.xz" # TODO fix arch + asset: 'shellcheck-{{.Version}}.{{.OS}}.{{.Arch}}.tar.xz' description: ShellCheck, a static analysis tool for shell scripts + replacements: + arm64: aarch64 + amd64: x86_64 files: - name: shellcheck src: shellcheck-{{.Version}}/shellcheck From 855627db227e7bc2b2f515dfa05d2d0a3c460931 Mon Sep 17 00:00:00 2001 From: 4513ECHO <4513echo@gmail.com> Date: Sat, 12 Feb 2022 11:50:46 +0900 Subject: [PATCH 2/4] fix: Fix some packages written in rust asset pattern for arm64 --- registry.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/registry.yaml b/registry.yaml index 1694b65e412..528097f0a1c 100644 --- a/registry.yaml +++ b/registry.yaml @@ -3080,7 +3080,7 @@ packages: amd64: x86_64 arm64: aarch64 darwin: apple-darwin - linux: unknown-linux-musl + linux: unknown-linux-gnu windows: pc-windows-msvc 386: i686 files: @@ -3100,7 +3100,7 @@ packages: amd64: x86_64 arm64: aarch64 darwin: apple-darwin - linux: unknown-linux-musl + linux: unknown-linux-gnu windows: pc-windows-msvc 386: i686 files: @@ -3856,6 +3856,7 @@ packages: darwin: apple-darwin linux: unknown-linux-gnu amd64: x86_64 + arm64: aarch64 - type: github_release repo_owner: xiecat repo_name: fofax From 8b8c1ea8b863d535aa3ef999d60f50a7d5c8e748 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 12 Feb 2022 14:28:53 +0900 Subject: [PATCH 3/4] Update registry.yaml --- registry.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/registry.yaml b/registry.yaml index 528097f0a1c..70764a104e8 100644 --- a/registry.yaml +++ b/registry.yaml @@ -2110,6 +2110,7 @@ packages: repo_owner: koalaman repo_name: shellcheck asset: 'shellcheck-{{.Version}}.{{.OS}}.{{.Arch}}.tar.xz' + rosetta2: true description: ShellCheck, a static analysis tool for shell scripts replacements: arm64: aarch64 From ac2c81e66d0c5f59da0c47a6d33ce9ea45e8b7e1 Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Sat, 12 Feb 2022 14:32:54 +0900 Subject: [PATCH 4/4] fix: change os by GOARCH --- registry.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/registry.yaml b/registry.yaml index 70764a104e8..880371da003 100644 --- a/registry.yaml +++ b/registry.yaml @@ -3071,7 +3071,7 @@ packages: repo_owner: sharkdp repo_name: bat rosetta2: true - asset: 'bat-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}}' + asset: 'bat-{{.Version}}-{{.Arch}}-{{if eq .GOOS "linux"}}{{if eq .GOARCH "amd64"}}unknown-linux-musl{{else}}unknown-linux-gnu{{end}}{{else}}{{.OS}}{{end}}.{{.Format}}' description: 'A cat(1) clone with wings.' format: tar.gz format_overrides: @@ -3081,17 +3081,16 @@ packages: amd64: x86_64 arm64: aarch64 darwin: apple-darwin - linux: unknown-linux-gnu windows: pc-windows-msvc 386: i686 files: - name: bat - src: 'bat-{{.Version}}-{{if eq .GOOS "darwin"}}x86_64{{else}}{{.Arch}}{{end}}-{{.OS}}/bat' + src: 'bat-{{.Version}}-{{.Arch}}-{{if eq .GOOS "linux"}}{{if eq .GOARCH "amd64"}}unknown-linux-musl{{else}}unknown-linux-gnu{{end}}{{else}}{{.OS}}{{end}}/bat' - type: github_release repo_owner: sharkdp repo_name: fd rosetta2: true - asset: 'fd-{{.Version}}-{{.Arch}}-{{.OS}}.{{.Format}}' + asset: 'fd-{{.Version}}-{{.Arch}}-{{if eq .GOOS "linux"}}{{if eq .GOARCH "amd64"}}unknown-linux-musl{{else}}unknown-linux-gnu{{end}}{{else}}{{.OS}}{{end}}.{{.Format}}' description: "A simple, fast and user-friendly alternative to 'find'" format: tar.gz format_overrides: @@ -3101,12 +3100,11 @@ packages: amd64: x86_64 arm64: aarch64 darwin: apple-darwin - linux: unknown-linux-gnu windows: pc-windows-msvc 386: i686 files: - name: fd - src: 'fd-{{.Version}}-{{if eq .GOOS "darwin"}}x86_64{{else}}{{.Arch}}{{end}}-{{.OS}}/fd' + src: 'fd-{{.Version}}-{{.Arch}}-{{if eq .GOOS "linux"}}{{if eq .GOARCH "amd64"}}unknown-linux-musl{{else}}unknown-linux-gnu{{end}}{{else}}{{.OS}}{{end}}/fd' - type: github_archive repo_owner: shellspec repo_name: shellspec