use unique artifact names and merge

robotpy · Jun 11, 2024 · b2e01e6 · b2e01e6
1 parent b2dbb4f
commit b2e01e6
Showing 1 changed file with 40 additions and 11 deletions.
diff --git 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 }}"