From 8a725f409bc1a6ff6042c42ff95c2b0fc99d5fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= <jeremy.laine@m4x.org>
Date: Mon, 27 May 2024 23:48:15 +0200
Subject: [PATCH] Update GitHub actions to their latest version

The behaviour of `actions/upload-artifact` have changed, we now need
distinct names for each artifact. This also means adjusting our use of
`actions/download-artifact` to collect all artifacts.
---
 .github/workflows/tests.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fcafb8d82..14bc87525 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,9 +17,9 @@ jobs:
           python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
           PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig python setup.py sdist
       - name: Upload source package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-source
           path: dist/
 
   package-wheel:
@@ -73,9 +73,9 @@ jobs:
           cibuildwheel --output-dir dist
         shell: bash
       - name: Upload wheels
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: dist
+          name: dist-${{ matrix.os }}-${{ matrix.arch }}
           path: dist/
 
   publish:
@@ -83,9 +83,9 @@ jobs:
     needs: [package-source, package-wheel]
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: dist
+          merge-multiple: true
           path: dist/
       - name: Publish to PyPI
         if: github.event_name == 'release' && github.event.action == 'published'