From ae073965f3cd4cc72ed241d421c6a3a8d7a5b6b9 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Tue, 13 Feb 2024 19:18:09 +0100
Subject: [PATCH] Migrate to artifacts v4

---
 .github/workflows/build.yml | 15 +++++++++++----
 .github/workflows/pr.yml    | 10 ++++++++--
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d092cf9..7451da2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -251,10 +251,16 @@ jobs:
         run: |
           T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
           ./build.sh ${{ matrix.target }} ${{ matrix.variant }}
+      - name: Replace spaces in string
+        id: strs
+        run: |
+          SLUG="${{ matrix.target }}-${{ matrix.variant }}"
+          echo "artifact_slug=${SLUG// /-}" >> $GITHUB_OUTPUT
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ffmpeg
+          name: ffmpeg-${{ steps.strs.outputs.artifact_slug }}
+          overwrite: true
           path: artifacts/*
   publish_release:
     name: Publish release
@@ -267,9 +273,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: ffmpeg
+          pattern: ffmpeg-*
+          merge-multiple: true
           path: artifacts
       - name: Create release
         id: create_release
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1bf4005..820b8da 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -57,8 +57,14 @@ jobs:
           QUICKBUILD: ${{ matrix.quickbuild }}
       - name: Build ffmpeg
         run: ./build.sh ${{ matrix.target }} ${{ matrix.variant }}
+      - name: Replace spaces in string
+        id: strs
+        run: |
+          SLUG="${{ matrix.target }}-${{ matrix.variant }}"
+          echo "artifact_slug=${SLUG// /-}" >> $GITHUB_OUTPUT
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: ffmpeg
+          name: ffmpeg-${{ steps.strs.outputs.artifact_slug }}
+          overwrite: true
           path: artifacts/*