From 477edd503c3420814d46fb5487a4bee81c4bbde1 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Wed, 24 Jul 2024 16:41:13 -0400 Subject: [PATCH] rename goreleaser amd64 config to match other archs --- .github/workflows/release.yml | 4 ++-- .goreleaser-linux.yml => .goreleaser-linux-amd64.yml | 0 docker/images/cross-build/linux-build.sh | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) rename .goreleaser-linux.yml => .goreleaser-linux-amd64.yml (100%) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba86e0b9..500ee20e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -48,7 +48,7 @@ jobs: with: distribution: goreleaser version: '~> v2' - args: release --skip=publish --config .goreleaser-linux.yml + args: release --skip=publish --config .goreleaser-linux-amd64.yml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -230,7 +230,7 @@ jobs: runs-on: macos-latest steps: - name: import distribution cert - uses: apple-actions/import-codesign-certs@v1 + uses: apple-actions/import-codesign-certs@v3 with: p12-file-base64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }} p12-password: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }} diff --git a/.goreleaser-linux.yml b/.goreleaser-linux-amd64.yml similarity index 100% rename from .goreleaser-linux.yml rename to .goreleaser-linux-amd64.yml diff --git a/docker/images/cross-build/linux-build.sh b/docker/images/cross-build/linux-build.sh index f75c0eff..002c288d 100755 --- a/docker/images/cross-build/linux-build.sh +++ b/docker/images/cross-build/linux-build.sh @@ -13,13 +13,11 @@ set -o xtrace resolveArch() { case ${1} in - amd64) echo amd64 - ;; arm|armv7*|arm/v7*|armhf*) echo armhf ;; - arm64|armv8*|arm/v8*) echo arm64 + armv8*|arm/v8*) echo arm64 ;; - *) echo ${1} + *) echo "${1}" ;; esac }