Update build image workflow, split built to avoid emulation

Author: supleed2

.github/workflows/build-images.yaml

@@ -8,8 +8,15 @@ on:
       - v[0-9]+.*
 jobs:
   build-image:
-    name: Build Docker Image
-    runs-on: ubuntu-latest
+    name: Build Docker Image (${{ matrix.platform }})
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      matrix:
+        include:
+          - platform: amd64
+            runner: ubuntu-24.04
+          - platform: arm64
+            runner: ubuntu-24.04-arm
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
@@ -19,16 +26,32 @@ jobs:
           registry: ghcr.io
           username: supleed2
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/${{ matrix.platform }}
           push: true
-          tags: |
-            ghcr.io/supleed2/nanobot:${{ github.ref_name }}
-            ghcr.io/supleed2/nanobot:latest
+          tags: ghcr.io/supleed2/nanobot:${{ github.ref_name }}-${{ matrix.platform }}
+  merge-manifests:
+    name: Merge Manifests
+    runs-on: ubuntu-24.04
+    needs: build-image
+    steps:
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: supleed2
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Create Multi-Platform Image
+        run: >
+          docker buildx imagetools create
+          -t ghcr.io/supleed2/nanobot:latest
+          -t ghcr.io/supleed2/nanobot:${{ github.ref_name }}
+          ghcr.io/supleed2/nanobot:${{ github.ref_name }}-amd64
+          ghcr.io/supleed2/nanobot:${{ github.ref_name }}-arm64