More tweaks, and only build arm for noble

Author: almahmoud

.github/workflows/build_ghcr.yaml

@@ -14,11 +14,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu: [focal, jammy, noble]
-        platform: [linux/amd64, linux/arm64]
-
-    name: Build container images for GHCR
-    runs-on: ubuntu-latest
+        include:
+          - ubuntu: focal
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - ubuntu: jammy
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - ubuntu: noble
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - ubuntu: noble
+            platform: linux/arm64
+            runner: ubuntu-latest-arm64
+
+    name: Build ${{ matrix.ubuntu }} (${{ matrix.platform }}) for GHCR
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -36,16 +47,8 @@ jobs:
         run: |
           echo container=$(echo '${{ steps.meta.outputs.tags }}' | awk -F':' '{print $1}') >> $GITHUB_OUTPUT
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-        if: contains(matrix.platform, 'arm64')
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          platforms: ${{matrix.platform}}
 
       - name: Login to GHCR
         uses: docker/login-action@v3
@@ -110,7 +113,7 @@ jobs:
       - name: Upload digests
         uses: actions/upload-artifact@v4
         with:
-          name: r2udigests-${{matrix.ubuntu}}-${{ github.run_id }}
+          name: r2udigests-${{matrix.ubuntu}}-${{replace(matrix.platform, '/', '-')}}-${{github.run_id}}
           path: /tmp/digests/**
           if-no-files-found: error
           retention-days: 1
@@ -125,16 +128,22 @@ jobs:
       matrix:
         ubuntu: [focal, jammy, noble]
     steps:
-      - name: Download digests
+      - name: Download amd64 digests
         uses: actions/download-artifact@v4
         with:
-          name: r2udigests-${{matrix.ubuntu}}-${{ github.run_id }}
+          name: r2udigests-${{matrix.ubuntu}}-linux-amd64-${{github.run_id}}
           path: /tmp/digests
 
+      - name: Download arm64 digests
+        uses: actions/download-artifact@v4
+        with:
+          name: r2udigests-${{matrix.ubuntu}}-linux-arm64-${{github.run_id}}
+          path: /tmp/digests
+        continue-on-error: true
+        if: matrix.ubuntu == 'noble'
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          platforms: ${{matrix.platform}}
 
       - name: Login to GHCR
         uses: docker/login-action@v3
@@ -163,15 +172,20 @@ jobs:
           cat digestdirs | xargs -i bash -c 'docker buildx imagetools create -t ${{steps.vars.outputs.container}}:{} $(for f in {}/*; do basename "$f"; done | xargs printf "${{steps.vars.outputs.container}}@sha256:%s ")'
 
   ghcrbuild_ci:
-    needs: ghcrbuild
+    needs: merge
     strategy:
       fail-fast: false
       matrix:
-        ubuntu: [noble_ci]
-        platform: [linux/amd64, linux/arm64]
-
-    name: Build CI container images for GHCR
-    runs-on: ubuntu-latest
+        include:
+          - ubuntu: noble_ci
+            platform: linux/amd64
+            runner: ubuntu-latest
+          - ubuntu: noble_ci
+            platform: linux/arm64
+            runner: ubuntu-latest-arm64
+
+    name: Build ${{ matrix.ubuntu }} (${{ matrix.platform }}) for GHCR
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -189,16 +203,8 @@ jobs:
         run: |
           echo container=$(echo '${{ steps.meta.outputs.tags }}' | awk -F':' '{print $1}') >> $GITHUB_OUTPUT
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-        if: contains(matrix.platform, 'arm64')
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          platforms: ${{matrix.platform}}
 
       - name: Login to GHCR
         uses: docker/login-action@v3
@@ -227,7 +233,7 @@ jobs:
       - name: Upload digests
         uses: actions/upload-artifact@v4
         with:
-          name: r2udigests-${{matrix.ubuntu}}-${{ github.run_id }}
+          name: r2udigests-${{matrix.ubuntu}}-${{replace(matrix.platform, '/', '-')}}-${{github.run_id}}
           path: /tmp/digests/**
           if-no-files-found: error
           retention-days: 1
@@ -242,16 +248,20 @@ jobs:
       matrix:
         ubuntu: [noble_ci]
     steps:
-      - name: Download digests
+      - name: Download amd64 digests
         uses: actions/download-artifact@v4
         with:
-          name: r2udigests-${{matrix.ubuntu}}-${{ github.run_id }}
+          name: r2udigests-${{matrix.ubuntu}}-linux-amd64-${{github.run_id}}
+          path: /tmp/digests
+
+      - name: Download arm64 digests
+        uses: actions/download-artifact@v4
+        with:
+          name: r2udigests-${{matrix.ubuntu}}-linux-arm64-${{github.run_id}}
           path: /tmp/digests
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        with:
-          platforms: ${{matrix.platform}}
 
       - name: Login to GHCR
         uses: docker/login-action@v3