From f134a6198f31aa8134eb3acbadc7e374c819f81a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Dec 2023 02:30:30 +0000
Subject: [PATCH 1/3] chore(deps): bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 6 +++---
 .github/workflows/tests.yml   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 523b0a8eaa0..40d1074b28c 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
@@ -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 cbe54b551fd..6f45bce5457 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -134,7 +134,7 @@ 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
           path: results

From 3f5bb8bfde24a0f50cf6a6d22537c4923e087b6f Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Mon, 25 Dec 2023 18:59:37 +0100
Subject: [PATCH 2/3] fix

---
 .github/workflows/release.yml |  2 +-
 .github/workflows/tests.yml   | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 40d1074b28c..717db45e3b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6f45bce5457..0b91689c5a7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -136,7 +136,7 @@ jobs:
         if: matrix.php-version == env.default-php-version && (success() || failure())
         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
+          name: 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
+          name: results-*
           path: results
+          merge-multiple: true
 
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4

From 6b714b37e5cbc34016ceb2a895343fd77f1b505b Mon Sep 17 00:00:00 2001
From: Alexis Saettler <alexis@saettler.org>
Date: Mon, 25 Dec 2023 19:19:59 +0100
Subject: [PATCH 3/3] fix

---
 .github/workflows/tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0b91689c5a7..52af5445253 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -157,7 +157,7 @@ jobs:
       - name: Download results
         uses: actions/download-artifact@v4
         with:
-          name: results-*
+          pattern: results-*
           path: results
           merge-multiple: true
 
@@ -211,7 +211,7 @@ jobs:
       - name: Download results
         uses: actions/download-artifact@v4
         with:
-          name: results-*
+          pattern: results-*
           path: results
           merge-multiple: true