From 689a093e328a5f1ab1ff82a55193c79fb474b4ea Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 17 Feb 2024 18:52:08 -0500
Subject: [PATCH] Upgrade artifacts actions

---
 .github/workflows/main.yml | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7047aa88..8529b418 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,19 +28,19 @@ jobs:
       - name: 'Run pre-build steps'
         run: build-scripts/prebuild ${{ secrets.GITHUB_TOKEN }}
       - name: 'Upload documentation for later build steps'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: doc
           path: doc.zip
       - name: 'Upload external libs'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: external-libs
           path: external-libs-dist
       - name: 'Upload doc distribution'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: distribution
+          name: distribution-prebuild
           path: distribution
   Linux:
     runs-on: ubuntu-latest
@@ -49,9 +49,9 @@ jobs:
       - name: 'Generate, build, and test'
         run: build-scripts/build-linux
       - name: Upload distribution
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: distribution
+          name: distribution-linux
           path: distribution
   Windows:
     runs-on: windows-latest
@@ -68,12 +68,12 @@ jobs:
         run: git config --global core.autocrlf input
       - uses: actions/checkout@v4
       - name: 'Download documentation'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: doc
           path: .
       - name: 'Download external libs'
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: external-libs
           path: .
@@ -81,9 +81,9 @@ jobs:
         shell: cmd
         run: build-scripts/build-windows.bat ${{ matrix.wordsize }} ${{ matrix.tool }}
       - name: 'Upload binary distributions'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: distribution
+          name: distribution-windows-${{ matrix.wordsize }}-${{ matrix.tool }}
           path: distribution
   macOS:
     runs-on: macos-latest
@@ -100,9 +100,9 @@ jobs:
       - name: 'Build AppImage'
         run: build-scripts/build-appimage
       - name: 'Upload AppImage'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: distribution
+          name: distribution-appimage
           path: distribution
   pikepdf:
     strategy:
@@ -152,3 +152,16 @@ jobs:
       - uses: actions/checkout@v4
       - name: ${{ matrix.script }}
         run: build-scripts/${{ matrix.script }}
+  MergeArtifacts:
+     runs-on: ubuntu-latest
+     needs:
+       - Prebuild
+       - Linux
+       - Windows
+       - AppImage
+     steps:
+       - name: Merge Artifacts
+         uses: actions/upload-artifact/merge@v4
+         with:
+           name: distribution
+           pattern: distribution-*