From 47766ba81b07562b629e7c4a4139df0f17659d03 Mon Sep 17 00:00:00 2001 From: Luis Alvergue Date: Thu, 19 Dec 2024 19:53:58 +0000 Subject: [PATCH 1/2] chore: remove redundant condition on deploy if --- .github/workflows/docker-publish.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index bb5edcbd..d910728f 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -28,8 +28,7 @@ jobs: deploy: needs: test # !cancelled() is needed because if the whole workflow was cancelled, we don't want this job to run. - # (github.ref_type != 'tag' || needs.test.result == 'success') is needed because if `test` did run, we only want this to run if `test` succeeded. - if: (!cancelled() && (github.ref_type != 'tag' || needs.test.result == 'success')) + if: (!cancelled()) runs-on: ubuntu-latest environment: ${{ github.ref_type != 'tag' && github.ref_name || contains(github.ref, '-rc') && 'test' || 'prod' }} From 5d98668fec83b2437e4fae80ec907828e5486db1 Mon Sep 17 00:00:00 2001 From: Luis Alvergue Date: Thu, 19 Dec 2024 19:55:10 +0000 Subject: [PATCH 2/2] chore: support building multi-platform image --- .github/workflows/docker-publish.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d910728f..c4bd61ad 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -64,6 +64,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3 @@ -71,6 +74,7 @@ jobs: - name: Build, tag, and push image to GitHub Container Registry uses: docker/build-push-action@v6 with: + platforms: linux/amd64,linux/arm64 builder: ${{ steps.buildx.outputs.name }} build-args: GIT-SHA=${{ github.sha }} cache-from: type=gha,scope=cal-itp