Revert ARM changes (#92)

* Revert "Disable `fail-fast`" This reverts commit 3474b4c. * Revert "Run ARM build on ARM machines" This reverts commit 5d9b250.
pgautoupgrade · Jan 29, 2025 · 536d763 · 536d763
1 parent 3474b4c
commit 536d763
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,11 +13,9 @@ jobs:
   base-images:
     # for security reason, we only build these images in our repository and on the main branch
     if: github.repository == 'pgautoupgrade/docker-pgautoupgrade' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        runner_image:
-          - "ubuntu-24.04"
-          - "ubuntu-24.04-arm"
         flavor:
           - alpine
           - bookworm
@@ -31,10 +29,11 @@ jobs:
           - "14"
           - "15"
           - "16"
-      fail-fast: false
-    runs-on: "${{ matrix.runner_image }}"
 
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -49,6 +48,7 @@ jobs:
         with:
           file: "Dockerfile.${{ matrix.flavor }}"
           push: true
+          platforms: linux/amd64,linux/arm64
           build-args: |
             "PGTARGET=16"
           target: "build-${{ matrix.pg_version }}"
@@ -57,6 +57,7 @@ jobs:
           cache-from: type=registry,ref=pgautoupgrade/pgautoupgrade:build-${{ matrix.pg_version }}-${{ matrix.flavor }}
 
   target-images:
+    runs-on: ubuntu-latest
     needs: base-images
     # otherwise, it would skip the build entirely (because the base step does not run)
     if: always()
@@ -79,9 +80,6 @@ jobs:
 
     strategy:
       matrix:
-        runner_image:
-          - "ubuntu-24.04"
-          - "ubuntu-24.04-arm"
         operating_system:
           - flavor: "alpine"
             # renovate: datasource=docker depName=alpine versioning=docker
@@ -96,10 +94,11 @@ jobs:
           - "15"
           - "16"
           - "17"
-      fail-fast: false
-    runs-on: "${{ matrix.runner_image }}"
 
     steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -148,6 +147,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: "Dockerfile.${{ matrix.operating_system.flavor }}"
+          platforms: linux/amd64,linux/arm64
           tags: |
             "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}"
             "pgautoupgrade/pgautoupgrade:${{ matrix.pg_target }}-${{ matrix.operating_system.flavor }}${{ matrix.operating_system.OS_VERSION }}"
@@ -163,6 +163,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: "Dockerfile.${{ matrix.operating_system.flavor }}"
+          platforms: linux/amd64,linux/arm64
           tags: |
             "pgautoupgrade/pgautoupgrade:${{ matrix.operating_system.flavor }}"
             "pgautoupgrade/pgautoupgrade:${{ matrix.operating_system.alias }}"
@@ -177,6 +178,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           file: "Dockerfile.${{ matrix.operating_system.flavor }}"
+          platforms: linux/amd64,linux/arm64
           tags: |
             "pgautoupgrade/pgautoupgrade:latest"
           build-args: |