From ffe168ef3ef0c0e13dc7ab97a8a48068e71707cb Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 09:29:01 +1100 Subject: [PATCH 1/6] feat: Add amd64v3 build artifacts --- .goreleaser.yml | 4 +++- .mise.toml | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 0ff1ec3..42824ae 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,6 +12,7 @@ builds: - CGO_ENABLED=0 goos: [ linux, darwin ] goarch: [ amd64, arm64 ] + goamd64: [ v1, v3 ] - id: skpr-rsh main: ./cmd/skpr-rsh @@ -22,11 +23,12 @@ builds: - CGO_ENABLED=0 goos: [ linux, darwin ] goarch: [ amd64, arm64 ] + goamd64: [ v1, v3 ] archives: - id: nix builds: [ skpr-cli, skpr-rsh ] - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}' + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if eq .Arch "amd64" }}{{ with .Amd64 }}_{{ . }}{{ end }}{{ else }}{{ with .Arm }}_v{{ . }}{{ end }}{{ end }}' wrap_in_directory: true format: tar.gz files: diff --git a/.mise.toml b/.mise.toml index 798d07d..e6f5733 100644 --- a/.mise.toml +++ b/.mise.toml @@ -42,3 +42,6 @@ depends = ["vendor"] description = "Release the command line interface" run = "goreleaser" depends = ["vendor"] + +[tasks.snapshot-release] +run = "goreleaser --snapshot --clean --verbose" From cafc4711651bdb9c5c38a943fcee5135ad12387d Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 09:42:23 +1100 Subject: [PATCH 2/6] Update readme --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b1ebd7b..b58efc8 100644 --- a/README.md +++ b/README.md @@ -47,15 +47,15 @@ You can download the binaries from the [Releases](https://github.com/skpr/cli/re #### MacOS ``` -curl -sSLO https://github.com/skpr/cli/releases/download/VERSION/skpr_darwin_amd64.tgz -sudo tar -zxf skpr_darwin_amd64.tgz -C /usr/local/bin/ +curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_macOS_amd64.tgz +sudo tar -zxf skpr_$VERSION_macOS_amd64.tgz -C /usr/local/bin/ ``` #### Linux ``` -curl -sSLO https://github.com/skpr/cli/releases/download/VERSION/skpr_linux_amd64.tgz -sudo tar -zxf skpr_linux_amd64.tgz -C /usr/local/bin/ +curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_linux_amd64_v3.tgz +sudo tar -zxf skpr_$VERSION_macOS_amd64.tgz -C /usr/local/bin/ ``` ## Documentation From 02e7c87ab8d917318963ce17afd97dca0b2382eb Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 09:42:48 +1100 Subject: [PATCH 3/6] Apply suggestions from code review Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .mise.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/.mise.toml b/.mise.toml index e6f5733..52a2225 100644 --- a/.mise.toml +++ b/.mise.toml @@ -44,4 +44,5 @@ run = "goreleaser" depends = ["vendor"] [tasks.snapshot-release] +description = "Create a snapshot release for local testing" run = "goreleaser --snapshot --clean --verbose" From 4d88fc627924c37f0fb97f85448141a0ea5eff91 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 09:52:00 +1100 Subject: [PATCH 4/6] Fix missing macOS packages --- .goreleaser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 42824ae..3a5ed1b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -28,7 +28,7 @@ builds: archives: - id: nix builds: [ skpr-cli, skpr-rsh ] - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if eq .Arch "amd64" }}{{ with .Amd64 }}_{{ . }}{{ end }}{{ else }}{{ with .Arm }}_v{{ . }}{{ end }}{{ end }}' + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if and (eq .Arch "amd64") (eq .Amd64 "v3") }}_v3{{ end }}' wrap_in_directory: true format: tar.gz files: From c8a4e7a461976507a9f4fb900cb91b4ba4cbde7c Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 10:12:16 +1100 Subject: [PATCH 5/6] Generate amd64v3 support in apt repo --- .gitignore | 1 + scripts/generate-apt-repo.sh | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 054c18b..8176b92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /.idea +/apt-repo /vendor /bin /dist diff --git a/scripts/generate-apt-repo.sh b/scripts/generate-apt-repo.sh index 10e1090..93f47fa 100755 --- a/scripts/generate-apt-repo.sh +++ b/scripts/generate-apt-repo.sh @@ -3,7 +3,7 @@ set -euo pipefail IFS=$'\n\t' main() { - ARCHS=(amd64 arm64) + ARCHS=(amd64 amd64v3 arm64) SUITE_DIR="dists/${SUITE:-stable}" COMPONENT_DIR="${SUITE_DIR}/${COMPONENTS-main}" @@ -28,7 +28,7 @@ main() { echo "Suite: ${SUITE:-stable}" echo "Codename: ${SUITE:-stable}" echo "Version: 1.0" - echo "Architectures: amd64 arm64" + echo "Architectures: amd64 amd64v3 arm64" echo "Components: ${COMPONENTS:-main}" echo "Description: ${DESCRIPTION:-A repository for packages released by ${REPO_OWNER:-skpr}}" echo "Date: $(date -Ru)" From ea25e39ef9ee220afa47ec86503838287b34c181 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 26 Feb 2026 10:21:44 +1100 Subject: [PATCH 6/6] Remove underscore and update readme --- .goreleaser.yml | 2 +- README.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 3a5ed1b..94fd2ce 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -28,7 +28,7 @@ builds: archives: - id: nix builds: [ skpr-cli, skpr-rsh ] - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if and (eq .Arch "amd64") (eq .Amd64 "v3") }}_v3{{ end }}' + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ if and (eq .Arch "amd64") (eq .Amd64 "v3") }}v3{{ end }}' wrap_in_directory: true format: tar.gz files: diff --git a/README.md b/README.md index b58efc8..d9ffb5c 100644 --- a/README.md +++ b/README.md @@ -47,15 +47,15 @@ You can download the binaries from the [Releases](https://github.com/skpr/cli/re #### MacOS ``` -curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_macOS_amd64.tgz -sudo tar -zxf skpr_$VERSION_macOS_amd64.tgz -C /usr/local/bin/ +curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_macOS_arm64.tar.gz +sudo tar -zxf skpr_$VERSION_macOS_arm64.tar.gz -C /usr/local/bin/ ``` #### Linux ``` -curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_linux_amd64_v3.tgz -sudo tar -zxf skpr_$VERSION_macOS_amd64.tgz -C /usr/local/bin/ +curl -sSLO https://github.com/skpr/cli/releases/download/$VERSION/skpr_$VERSION_linux_amd64v3.tar.gz +sudo tar -zxf skpr_$VERSION_linux_amd64v3.tar.gz -C /usr/local/bin/ ``` ## Documentation