From d49e5c5bc86f8b4960caed09f2fa112cb3059d6f Mon Sep 17 00:00:00 2001 From: max furman Date: Tue, 19 Nov 2024 20:49:08 -0800 Subject: [PATCH 1/3] [ci] goreleaser changed build directory for arm64 to arm64_v8.0 --- .goreleaser.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index a60801616..ecee6f3ce 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -277,13 +277,13 @@ blobs: extra_files: - glob: ./dist/default_darwin_amd64_v1/bin/step name_template: step_{{ .Version }}_darwin_amd64 - - glob: ./dist/default_darwin_arm64/bin/step + - glob: ./dist/default_darwin_arm64_v8.0/bin/step name_template: step_{{ .Version }}_darwin_arm64 - glob: ./dist/default_linux_amd64_v1/bin/step name_template: step_{{ .Version }}_linux_amd64 - - glob: ./dist/default_linux_arm64/bin/step + - glob: ./dist/default_linux_arm64_v8.0/bin/step name_template: step_{{ .Version }}_linux_arm64 - - glob: ./dist/default_windows_arm64/bin/step.exe + - glob: ./dist/default_windows_amd64_v1/bin/step.exe name_template: step_{{ .Version }}_windows_amd64.exe - glob: ./dist/default_freebsd_*/bin/step name_template: step_{{ .Version }}_freebsd_amd64 @@ -297,13 +297,13 @@ blobs: extra_files: - glob: ./dist/default_darwin_amd64_v1/bin/step name_template: step_latest_darwin_amd64 - - glob: ./dist/default_darwin_arm64/bin/step + - glob: ./dist/default_darwin_arm64_v8.0/bin/step name_template: step_latest_darwin_arm64 - glob: ./dist/default_linux_amd64_v1/bin/step name_template: step_latest_linux_amd64 - - glob: ./dist/default_linux_arm64/bin/step + - glob: ./dist/default_linux_arm64_v8.0/bin/step name_template: step_latest_linux_arm64 - - glob: ./dist/default_windows_arm64/bin/step.exe + - glob: ./dist/default_windows_amd64_v1/bin/step.exe name_template: step_latest_windows_amd64.exe - glob: ./dist/default_freebsd_*/bin/step name_template: step_latest_freebsd_amd64 From ba888b4a5e95ebd6be9d9fc59c79fe9d02336997 Mon Sep 17 00:00:00 2001 From: max furman Date: Wed, 20 Nov 2024 09:49:19 -0800 Subject: [PATCH 2/3] Use * rather than explicit version to find arm64 builds --- .goreleaser.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index ecee6f3ce..ff51b7665 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -277,11 +277,11 @@ blobs: extra_files: - glob: ./dist/default_darwin_amd64_v1/bin/step name_template: step_{{ .Version }}_darwin_amd64 - - glob: ./dist/default_darwin_arm64_v8.0/bin/step + - glob: ./dist/default_darwin_arm64*/bin/step name_template: step_{{ .Version }}_darwin_arm64 - glob: ./dist/default_linux_amd64_v1/bin/step name_template: step_{{ .Version }}_linux_amd64 - - glob: ./dist/default_linux_arm64_v8.0/bin/step + - glob: ./dist/default_linux_arm64*/bin/step name_template: step_{{ .Version }}_linux_arm64 - glob: ./dist/default_windows_amd64_v1/bin/step.exe name_template: step_{{ .Version }}_windows_amd64.exe @@ -297,11 +297,11 @@ blobs: extra_files: - glob: ./dist/default_darwin_amd64_v1/bin/step name_template: step_latest_darwin_amd64 - - glob: ./dist/default_darwin_arm64_v8.0/bin/step + - glob: ./dist/default_darwin_arm64*/bin/step name_template: step_latest_darwin_arm64 - glob: ./dist/default_linux_amd64_v1/bin/step name_template: step_latest_linux_amd64 - - glob: ./dist/default_linux_arm64_v8.0/bin/step + - glob: ./dist/default_linux_arm64*/bin/step name_template: step_latest_linux_arm64 - glob: ./dist/default_windows_amd64_v1/bin/step.exe name_template: step_latest_windows_amd64.exe From 1dc264298c5f4aaa146aaed8e62c35a7d35a7a76 Mon Sep 17 00:00:00 2001 From: max furman Date: Wed, 20 Nov 2024 10:40:29 -0800 Subject: [PATCH 3/3] [ci] fix deprecation warnings from goreleaser linter --- .goreleaser.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index ff51b7665..5a9930ce1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -53,11 +53,9 @@ builds: # - the name of the output binary is step-cli << : *BUILD id: nfpm - goos: - - linux - goarch: - - amd64 - - arm64 + targets: + - linux_amd64 + - linux_arm64 binary: step-cli archives: @@ -165,7 +163,7 @@ publishers: cmd: ./scripts/package-upload.sh {{ abs .ArtifactPath }} {{ .Var.packageName }} {{ .Version }} {{ .Var.packageRelease }} snapshot: - name_template: "{{ .Tag }}-next" + version_template: "{{ .Tag }}-next" release: # Repo in which the release will be created.