From cd873165589a1bc107fff5f003a97947d162e56e Mon Sep 17 00:00:00 2001
From: Andrew Straw <strawman@astraw.com>
Date: Thu, 8 Aug 2024 07:12:56 +0200
Subject: [PATCH] ci: fixup 2fee10bc3dc02a2521ab8a1e4e094891151bed1b

---
 .github/workflows/pybraidz-chunked-iter.yml | 42 +++++++++++++++------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pybraidz-chunked-iter.yml b/.github/workflows/pybraidz-chunked-iter.yml
index 309d1978c..fd4639753 100644
--- a/.github/workflows/pybraidz-chunked-iter.yml
+++ b/.github/workflows/pybraidz-chunked-iter.yml
@@ -36,19 +36,19 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.10"
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: 'true'
+          sccache: "true"
           working-directory: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter
           manylinux: auto
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-linux-${{ matrix.target }}
           path: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter/dist
 
   windows:
@@ -61,19 +61,19 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.10"
           architecture: ${{ matrix.target }}
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: 'true'
+          sccache: "true"
           working-directory: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-windows-${{ matrix.target }}
           path: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter/dist
 
   macos:
@@ -85,18 +85,18 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: "3.10"
       - name: Build wheels
         uses: PyO3/maturin-action@v1
         with:
           target: ${{ matrix.target }}
           args: --release --out dist --find-interpreter
-          sccache: 'true'
+          sccache: "true"
           working-directory: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-macos-${{ matrix.target }}
           path: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter/dist
 
   sdist:
@@ -112,18 +112,36 @@ jobs:
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: wheels-sdist
           path: braidz-parser/braidz-chunked-iter/pybraidz-chunked-iter/dist
 
+  merge:
+    name: Merge wheels
+    runs-on: ubuntu-latest
+    needs: [linux, windows, macos, sdist]
+    steps:
+      - name: Download wheels
+        uses: actions/download-artifact@v4
+        with:
+          path: wheels
+          pattern: wheels-*
+          merge-multiple: true
+      - name: Upload final artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wheels
+          path: wheels
+
   release:
     name: Release
     runs-on: ubuntu-latest
     if: "startsWith(github.ref, 'refs/tags/pybraidz-chunked-iter')"
-    needs: [linux, windows, macos, sdist]
+    needs: [merge]
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: wheels
+          path: wheels
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env: