Download manifests correctly

Author: zacblazic

.github/workflows/release.yml

@@ -38,15 +38,12 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: triton-wheels
+          name: triton-wheels-${{ matrix.config.arch }}
           path: ./wheelhouse/*.whl
 
-  docker-hub-release-amd64:
+  docker-hub-release:
     runs-on: ubuntu-latest
-    concurrency: amd64
-    outputs:
-      image-digest: ${{ steps.build.outputs.digest }}
-      image-tags: ${{ steps.metadata.outputs.tags }}
+    needs: build-triton-wheel
     steps:
       - name: Free additional disk space
         run: |
@@ -63,68 +60,21 @@ jobs:
           df -h
       - name: Checkout
         uses: actions/checkout@v5
-      - name: Prepare image metadata
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE }}
-          tags: |
-            type=ref,event=tag,suffix=-amd64
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: Build, tag, and push image
-        id: build
-        uses: docker/build-push-action@v6
+      - name: Download amd64 wheels
+        uses: actions/download-artifact@v5
         with:
-          context: .
-          file: Dockerfile.amd64
-          labels: ${{ steps.metadata.outputs.labels }}
-          platforms: linux/amd64
-          push: true
-          tags: ${{ steps.metadata.outputs.tags }}
-
-  docker-hub-release-arm64:
-    runs-on: ubuntu-latest
-    needs: build-triton-wheel-arm64
-    concurrency: arm64
-    outputs:
-      image-digest: ${{ steps.build.outputs.digest }}
-      image-tags: ${{ steps.metadata.outputs.tags }}
-    steps:
-      - name: Free additional disk space
-        run: |
-          df -h
-          echo "Removing android..."
-          sudo rm -rf /usr/local/lib/android
-          echo "Removing dotnet..."
-          sudo rm -rf /usr/share/dotnet
-          echo "Removing haskell"
-          sudo rm -rf /opt/ghc
-          sudo rm -rf /usr/local/.ghcup
-          echo "Removing tool cache..."
-          sudo rm -rf /opt/hostedtoolcache
-          df -h
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Download a single artifact
+          name: triton-wheels-x86_64
+          path: ./wheelhouse/
+      - name: Download arm64 wheels
         uses: actions/download-artifact@v5
         with:
-          name: triton-wheels-linux-arm64
+          name: triton-wheels-aarch64
           path: ./wheelhouse/
       - name: Prepare image metadata
         id: metadata
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.IMAGE }}
-          tags: |
-            type=ref,event=tag,suffix=-arm64
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
@@ -134,72 +84,19 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: Build, tag, and push image
-        id: build
+      - name: Build, tag, and push image to Docker Hub
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: Dockerfile.arm64
+          file: Dockerfile
           labels: ${{ steps.metadata.outputs.labels }}
-          platforms: linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.metadata.outputs.tags }}
 
-  docker-hub-release-manifest:
-    runs-on: ubuntu-latest
-    needs:
-      - docker-hub-release-amd64
-      - docker-hub-release-arm64
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-      - name: Prepare image metadata
-        id: metadata
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.IMAGE }}
-          tags: |
-            type=ref,event=pr
-            type=raw,value=latest
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-      - name: Create and push multi-arch manifest
-        run: |
-          # Extract the main tag (without architecture suffix)
-          MAIN_TAGS="${{ steps.metadata.outputs.tags }}"
-
-          # Get architecture-specific tags from previous jobs
-          AMD64_TAGS="${{ needs.docker-hub-release-amd64.outputs.image-tags }}"
-          ARM64_TAGS="${{ needs.docker-hub-release-arm64.outputs.image-tags }}"
-
-          # Extract the first tag from each architecture
-          AMD64_TAG=$(echo "$AMD64_TAGS" | head -n1)
-          ARM64_TAG=$(echo "$ARM64_TAGS" | head -n1)
-
-          # Create and push manifest for each main tag
-          echo "$MAIN_TAGS" | while read -r TAG; do
-            if [ -n "$TAG" ]; then
-              echo "Creating manifest for $TAG"
-              docker buildx imagetools create -t "$TAG" "$AMD64_TAG" "$ARM64_TAG"
-            fi
-          done
-      - name: Update description on Docker Hub
-        uses: peter-evans/dockerhub-description@v5
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_TOKEN }}
-          repository: ${{ env.IMAGE }}
-
   github-release:
     runs-on: ubuntu-latest
-    needs: docker-hub-release-manifest
+    needs: docker-hub-release
     steps:
       - name: Checkout
         uses: actions/checkout@v5

.github/workflows/test.yml

@@ -60,10 +60,15 @@ jobs:
           df -h
       - name: Checkout
         uses: actions/checkout@v5
-      - name: Download a single artifact
+      - name: Download amd64 wheels
         uses: actions/download-artifact@v5
         with:
-          name: triton-wheels
+          name: triton-wheels-x86_64
+          path: ./wheelhouse/
+      - name: Download arm64 wheels
+        uses: actions/download-artifact@v5
+        with:
+          name: triton-wheels-aarch64
           path: ./wheelhouse/
       - name: Prepare image metadata
         id: metadata