From b2dbb4f76902d1bc9a13bfb776bc2bc6849faf14 Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Sat, 8 Jun 2024 21:07:34 -0700
Subject: [PATCH 1/2] Update actions versions to Node 20

---
 .github/workflows/dist.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index 19e0c9f7..c546e32b 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -41,7 +41,7 @@ jobs:
     - uses: actions/checkout@v4
     - uses: psf/black@stable
 
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: "3.12"
 
@@ -79,7 +79,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v4
+    - uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python_version }}
 
@@ -123,7 +123,7 @@ jobs:
         RPYBUILD_STRIP_LIBPYTHON: "1"
         RPYBUILD_CC_LAUNCHER: ccache
 
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: "dist-${{ runner.os }}"
         path: dist
@@ -206,7 +206,7 @@ jobs:
         RPYBUILD_STRIP_LIBPYTHON: "1"
         RPYBUILD_CC_LAUNCHER: ccache
       
-    - uses: actions/upload-artifact@v3
+    - uses: actions/upload-artifact@v4
       with:
         name: dist-${{ matrix.os.name }}
         path: dist
@@ -221,12 +221,12 @@ jobs:
     if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
 
     steps:
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: dist-roborio
         path: dist/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: dist-raspbian
         path: dist/
@@ -251,17 +251,17 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: dist-Windows
         path: dist/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: dist-macOS
         path: dist/
     
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       with:
         name: dist-Linux
         path: dist/

From b2e01e6c06a0d29419c4c92c1ed2459c5738e534 Mon Sep 17 00:00:00 2001
From: sciencewhiz <sciencewhiz@users.noreply.github.com>
Date: Mon, 10 Jun 2024 18:13:39 -0700
Subject: [PATCH 2/2] use unique artifact names and merge

---
 .github/workflows/dist.yml | 51 ++++++++++++++++++++++++++++++--------
 1 file changed, 40 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml
index c546e32b..f2eb158f 100644
--- a/.github/workflows/dist.yml
+++ b/.github/workflows/dist.yml
@@ -125,9 +125,38 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: "dist-${{ runner.os }}"
+        name: "dist-${{ runner.os }}-${{ matrix.python_version }}"
         path: dist
 
+  merge:
+    runs-on: ubuntu-latest
+    needs: [cross-build, build]
+    steps:
+      - name: Merge Windows Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: dist-Windows
+          pattern: dist-Windows*
+          delete-merged: true
+      - name: Merge Linux Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: dist-Linux
+          pattern: dist-Linux*
+          delete-merged: true
+      - name: Merge macOS Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: dist-macOS
+          pattern: dist-macOS*
+          delete-merged: true
+      - name: Merge raspbian Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: dist-raspbian
+          pattern: dist-raspbian*
+          delete-merged: true
+
   #
   # Build roboRIO/raspbian wheels
   #
@@ -143,26 +172,26 @@ jobs:
           name: roborio
 
         - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38
-          name: raspbian
+          name: raspbian-py38
         - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py39
-          name: raspbian
+          name: raspbian-py39
         - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py310
-          name: raspbian
+          name: raspbian-py310
         - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py311
-          name: raspbian
+          name: raspbian-py311
         - container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
-          name: raspbian
+          name: raspbian-py312
         
         - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py38
-          name: raspbian
+          name: raspbian-aarch64-py38
         - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py39
-          name: raspbian
+          name: raspbian-aarch64-py39
         - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310
-          name: raspbian
+          name: raspbian-aarch64-py310
         - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311
-          name: raspbian
+          name: raspbian-aarch64-py311
         - container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
-          name: raspbian
+          name: raspbian-aarch64-py312
 
     container:
       image: "${{ matrix.os.container }}"