From 28ecadc1e80407a13a81441181d94b0df3e2ca8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Dec 2023 09:15:04 +0100
Subject: [PATCH] chore(deps): bump actions/upload-artifact from 3 to 4 (#7075)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexis Saettler <alexis@saettler.org>
---
 .github/workflows/release.yml |  8 ++++----
 .github/workflows/tests.yml   | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 523b0a8eaa0..717db45e3b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -59,7 +59,7 @@ jobs:
 
       - name: Store changelog file
         if: steps.semantic.outputs.new_release_published == 'true'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: changelog
           path: CHANGELOG.md
@@ -76,7 +76,7 @@ jobs:
         with:
           ref: v${{ needs.semantic.outputs.new_release_version }}
       - name: Download changelog file
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: changelog
 
@@ -129,13 +129,13 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Store package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: package
           path: ${{ steps.package.outputs.package }}
 
       - name: Store assets
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: assets
           path: ${{ steps.package.outputs.assets }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cdbfea7e12d..675d3f98fde 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -134,9 +134,9 @@ jobs:
 
       - name: Store results
         if: matrix.php-version == env.default-php-version && (success() || failure())
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: results
+          name: results-${{ matrix.php-version }}-${{ matrix.connection }}-${{ matrix.testsuite }}
           path: results
 
   ###########################
@@ -155,10 +155,11 @@ jobs:
           fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
 
       - name: Download results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: results
+          pattern: results-*
           path: results
+          merge-multiple: true
 
       - name: Merge junit files
         run: |
@@ -208,10 +209,11 @@ jobs:
 
     steps:
       - name: Download results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: results
+          pattern: results-*
           path: results
+          merge-multiple: true
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4