From ace6ca4fab96079fed71a11a501739623f873722 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 1 Feb 2024 13:41:11 +0800 Subject: [PATCH 1/4] Update push-image.yml Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 0d46e9e88..820ded2f0 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -19,13 +19,15 @@ env: jobs: build: - runs-on: ubuntu-latest strategy: fail-fast: false matrix: - platform: - - linux/amd64 - - linux/arm64 + include: + - os: ubuntu-latest + platform: linux/amd64 + - os: macos-14 + platform: linux/arm64 + runs-on: ${{ matrix.os }} steps: - name: Prepare From badba457391826266bc6e0ba4701f89dee717180 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 1 Feb 2024 13:46:20 +0800 Subject: [PATCH 2/4] chore: remove qemu Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 820ded2f0..ef855f24f 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -43,9 +43,6 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 326386db32c9cd2b5b167d1829fb35879a771afc Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 1 Feb 2024 13:54:18 +0800 Subject: [PATCH 3/4] chore: setup docker on macos runniner Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index ef855f24f..9286d06d0 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -43,6 +43,12 @@ jobs: uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} + + - + name: Setup docker on macos + if: startsWith(matrix.os, 'macos') + uses: douglascamata/setup-docker-macos-action@v1-alpha + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 4bbbeee02f00548a4927309df7b5108c58711841 Mon Sep 17 00:00:00 2001 From: Yukai Huang Date: Thu, 1 Feb 2024 13:54:56 +0800 Subject: [PATCH 4/4] chore: fail fast to true Signed-off-by: Yukai Huang --- .github/workflows/push-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index 9286d06d0..f0142cf80 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -20,7 +20,7 @@ env: jobs: build: strategy: - fail-fast: false + fail-fast: true matrix: include: - os: ubuntu-latest