Revert "Split build image actions (#17793)" (#17907)

This reverts commit 22eeaf2645e44ea800a6e4c4acb7bf9d72211344.

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index 0fa28aca16dc7dd5a7351c04473f220d76492e7b..75c7b54a65db278ce53e3198d575fc67aa2deb20 100644 (file)
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -13,9 +13,6 @@ on:
 jobs:
   build-image:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os: [linux/arm64, linux/amd64]
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-qemu-action@v1
@@ -38,7 +35,7 @@ jobs:
       - uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: ${{ matrix.os }}
+          platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=tootsuite/mastodon:latest