diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cf02a989..7a1bc3fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -2,11 +2,11 @@ name: Build on: workflow_dispatch: - inputs: + inputs: {} jobs: build-linux-x86_64: - name: Build - linux x86_64 + name: Build - Linux x86_64 runs-on: ubuntu-latest steps: - name: Checkout code @@ -24,7 +24,7 @@ jobs: run: just build build-macos: - name: Build - macos + name: Build - MacOS runs-on: macos-latest steps: - name: Checkout code @@ -44,7 +44,7 @@ jobs: just build build-windows: - name: Build - windows + name: Build - Windows runs-on: windows-latest steps: - name: Checkout code diff --git a/.github/workflows/buildx.yaml b/.github/workflows/buildx.yaml index 98fe9ac0..5c2450f6 100644 --- a/.github/workflows/buildx.yaml +++ b/.github/workflows/buildx.yaml @@ -2,11 +2,11 @@ name: Buildx on: workflow_dispatch: - inputs: + inputs: {} jobs: build-linux-aarch64: - name: Build - linux aarch64 + name: Build - linux ARM64 runs-on: ubuntu-latest steps: - name: Checkout code @@ -17,7 +17,7 @@ jobs: - name: Setup Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: version: latest diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d9b985e4..9ea8e235 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -2,11 +2,12 @@ name: PR/Push on: workflow_dispatch: - inputs: + inputs: {} pull_request: push: branches: - main + - dev jobs: build-linux-x86_64: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6dafeaa9..ad48a1e4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,7 +33,7 @@ jobs: tag_name: ${{ github.ref_name }} release-linux-x86_64: - name: Release - linux x86_64 + name: Release - Linux x86_64 runs-on: ubuntu-latest needs: create_release steps: @@ -57,7 +57,7 @@ jobs: files: "./.target/*" release-linux-aarch64: - name: Release - linux aarch64 + name: Release - Linux aarch64 runs-on: ubuntu-latest needs: - create_release @@ -70,7 +70,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 with: version: latest @@ -88,8 +88,11 @@ jobs: files: "./.target/*" release-macos: - name: Release - macos - runs-on: macos-latest + name: Release - MacOS + runs-on: ${{ matrix.runner }} + strategy: + matrix: + runner: [ macos-latest-large, macos-latest ] needs: - create_release steps: @@ -114,7 +117,7 @@ jobs: files: "./.target/*" release-windows: - name: Release - windows + name: Release - Windows runs-on: windows-latest needs: - create_release diff --git a/hack/generate-artifact-name.sh b/hack/generate-artifact-name.sh index ca47c429..28e16802 100755 --- a/hack/generate-artifact-name.sh +++ b/hack/generate-artifact-name.sh @@ -10,23 +10,31 @@ case $os in "aarch64") filename="huber-linux-arm64" ;; - "armv7l") - filename="huber-linux-armv7" - ;; "x86_64") filename="huber-linux-amd64" ;; *) - echo "The architecture ($arch) is not supported" >/dev/stderr + echo "$os:$arch is not supported" >/dev/stderr exit 1 ;; esac ;; "Darwin") - filename="huber-darwin-amd64" + case $arch in + "arm64") + filename="huber-darwin-arm64" + ;; + "x86_64") + filename="huber-darwin-amd64" + ;; + *) + echo "$os:$arch is not supported" >/dev/stderr + exit 1 + ;; + esac ;; *) - echo "The platform ($os) is not supported" >/dev/stderr + echo "$os:$arch is not supported" >/dev/stderr exit 1 ;; esac diff --git a/hack/install.sh b/hack/install.sh index 943e97a9..30c2b2c5 100755 --- a/hack/install.sh +++ b/hack/install.sh @@ -25,7 +25,7 @@ case $os in filename="huber-linux-amd64" ;; *) - echo "The architecture ($arch) is not supported" >/dev/stderr + echo "$os:$arch is not supported" >/dev/stderr exit 1 ;; esac @@ -39,7 +39,7 @@ case $os in filename="huber-darwin-amd64" ;; *) - echo "The architecture ($arch) is not supported" >/dev/stderr + echo "$os:$arch is not supported" >/dev/stderr exit 1 ;; esac