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/.goreleaser.yml b/.goreleaser.yml index 0ff1ec3..94fd2ce 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 and (eq .Arch "amd64") (eq .Amd64 "v3") }}v3{{ end }}' wrap_in_directory: true format: tar.gz files: diff --git a/.mise.toml b/.mise.toml index 798d07d..52a2225 100644 --- a/.mise.toml +++ b/.mise.toml @@ -42,3 +42,7 @@ depends = ["vendor"] description = "Release the command line interface" run = "goreleaser" depends = ["vendor"] + +[tasks.snapshot-release] +description = "Create a snapshot release for local testing" +run = "goreleaser --snapshot --clean --verbose" diff --git a/README.md b/README.md index b1ebd7b..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_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_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_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_amd64v3.tar.gz +sudo tar -zxf skpr_$VERSION_linux_amd64v3.tar.gz -C /usr/local/bin/ ``` ## Documentation 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)"