From b322e38143e77292eb36da103890621de321c25c Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Sun, 9 Feb 2025 13:38:24 +0100
Subject: [PATCH] Use a multi-arch manifest

---
 .github/workflows/build.yml | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca64c0d..da7e94f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,12 +14,12 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-24.04${{matrix.arch=='arm' && '-arm' || ''}}
+    runs-on: ubuntu-24.04${{matrix.arch=='arm64' && '-arm' || ''}}
     strategy:
       fail-fast: false
       matrix:
         os: [ 'debian', 'ubuntu' ]
-        arch: [ 'intel', 'arm' ]
+        arch: [ 'amd64', 'arm64' ]
     steps:
       - name: Free some disk space
         run: rm -Rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
@@ -53,5 +53,23 @@ jobs:
           context: ${{ matrix.os }}
           push: true
           tags: |
-            cran/${{matrix.os}}:latest
-            ghcr.io/${{github.repository}}/${{matrix.os}}:latest
+            ghcr.io/${{github.repository}}/${{matrix.os}}:latest_{matrix.arch}
+
+  build:
+    runs-on: ubuntu-24.04
+    needs: [build]
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ 'debian', 'ubuntu' ]        
+    steps:
+      - name: Free some disk space
+        run: rm -Rf /usr/share/dotnet /opt/ghc "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY"
+
+      - name: Create multi-arch manifest
+        run: |
+        docker manifest create \
+          ghcr.io/${{github.repository}}/${{matrix.os}}:latest \
+          ghcr.io/${{github.repository}}/${{matrix.os}}:latest_amd64 \
+          ghcr.io/${{github.repository}}/${{matrix.os}}:latest_arm64
+        docker manifest push ghcr.io/${{github.repository}}/${{matrix.os}}:latest