From c390a2ab15d4f023cbdc18d7ba125e59fd1b774c Mon Sep 17 00:00:00 2001
From: Henry Schreiner <henryschreineriii@gmail.com>
Date: Fri, 15 Dec 2023 09:26:58 -0500
Subject: [PATCH 1/2] ci: support artifact v4

Signed-off-by: Henry Schreiner <henryschreineriii@gmail.com>
---
 .github/workflows/build.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ce1f75b93..36872a15f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,6 +117,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
         with:
+          name: Wheel-${{ matrix.os }}-${{ matrix.arch }}
           path: ./wheelhouse/*.whl
 
   build_manylinux2010_wheels:
@@ -145,6 +146,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: Wheel-manylinux2010-${{ matrix.arch }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -161,6 +163,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: SDist
           path: dist/*.tar.gz
 
   test_sdist:
@@ -199,7 +202,7 @@ jobs:
 
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: SDist
           path: dist
 
       - name: Install SDist
@@ -219,10 +222,9 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
-          path: dist
+          path: all
 
-      - run: pipx run twine check --strict dist/*
+      - run: pipx run twine check --strict all/*/*
 
   upload_pypi:
     name: Upload to PyPI
@@ -237,7 +239,11 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
-          path: dist
+          path: all
+
+      - name: Merge files
+        run: |
+          mkdir dist
+          mv all/*/* dist/.
 
       - uses: pypa/gh-action-pypi-publish@release/v1

From b017e510dda282c1acb6f15b10168f58364cd2e8 Mon Sep 17 00:00:00 2001
From: Henry Schreiner <HenrySchreinerIII@gmail.com>
Date: Fri, 15 Dec 2023 10:02:33 -0500
Subject: [PATCH 2/2] Update .github/workflows/build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 36872a15f..22853157c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -117,7 +117,7 @@ jobs:
       - uses: actions/upload-artifact@v4
         if: (!matrix.use_qemu) || fromJSON(env.USE_QEMU)
         with:
-          name: Wheel-${{ matrix.os }}-${{ matrix.arch }}
+          name: Wheel-${{ matrix.os }}-${{ matrix.build }}${{ matrix.arch }}
           path: ./wheelhouse/*.whl
 
   build_manylinux2010_wheels: