From 27f57a989170805b80e6687ec861aacc2c3602b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Feb 2024 19:10:54 +0000
Subject: [PATCH 1/2] chore(deps): Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eec350c..1990737 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
             dnf install -y clang-libs clang || apt install llvm-dev libclang-dev clang
 
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: dist
@@ -101,7 +101,7 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: 'true'
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: dist
@@ -136,7 +136,7 @@ jobs:
           args: --release --out dist --find-interpreter
           sccache: 'true'
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: dist
@@ -160,7 +160,7 @@ jobs:
           command: sdist
           args: --out dist
       - name: Upload sdist
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wheels
           path: dist

From fdc418c79bd30ddf58f89e6b160e0858afea1a63 Mon Sep 17 00:00:00 2001
From: Ben Mares <services-git-throwaway1@tensorial.com>
Date: Mon, 19 Feb 2024 23:24:40 +0100
Subject: [PATCH 2/2] Separate out individual wheel uploads

---
 .github/workflows/ci.yml | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1990737..7313043 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # If you update the targets here, be sure to also update the
+        # download-artifact step in the release job!
         target: [x86_64]
         # pytensor is currently giving me issues on the other targets...
         #target: [x86_64, aarch64, s390x, ppc64le]
@@ -44,7 +46,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: linux-${{ matrix.target }}-wheels
           path: dist
       - name: pytest
         if: ${{ startsWith(matrix.target, 'x86_64') }}
@@ -76,6 +78,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # If you update the targets here, be sure to also update the
+        # download-artifact step in the release job!
         target: [x64]
     steps:
       - uses: actions/checkout@v4
@@ -103,7 +107,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: windows-${{ matrix.target }}-wheels
           path: dist
       - name: pytest
         if: ${{ !startsWith(matrix.target, 'aarch64') }}
@@ -120,6 +124,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # If you update the targets here, be sure to also update the
+        # download-artifact step in the release job!
         target: [x86_64, aarch64]
     steps:
       - uses: actions/checkout@v4
@@ -138,7 +144,7 @@ jobs:
       - name: Upload wheels
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: macos-${{ matrix.target }}-wheels
           path: dist
       - name: pytest
         if: ${{ !startsWith(matrix.target, 'aarch64') }}
@@ -162,7 +168,7 @@ jobs:
       - name: Upload sdist
         uses: actions/upload-artifact@v4
         with:
-          name: wheels
+          name: sdist
           path: dist
 
   release:
@@ -171,9 +177,28 @@ jobs:
     if: "startsWith(github.ref, 'refs/tags/')"
     needs: [linux, windows, macos, sdist]
     steps:
+      # Combine all the wheels and sdists into a single directory
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: linux-x86_64-wheels
+          path: dist
+      - uses: actions/download-artifact@v4
+        with:
+          name: windows-x64-wheels
+          path: dist
+      - uses: actions/download-artifact@v4
+        with:
+          name: macos-x86_64-wheels
+          path: dist
+      - uses: actions/download-artifact@v4
+        with:
+          name: macos-aarch64-wheels
+          path: dist
       - uses: actions/download-artifact@v4
         with:
-          name: wheels
+          name: sdist
+          path: dist
       - name: Publish to PyPI
         uses: PyO3/maturin-action@v1
         env: