From 1dbcdfb6b29036798be348dc05fccda90121e66a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 19 Jan 2024 08:54:49 +0000
Subject: [PATCH] Use Github Artifacts v4 (#12152)

---
 .github/workflows/element-web.yaml      |  2 +-
 .github/workflows/end-to-end-tests.yaml | 17 ++++++++---------
 .github/workflows/netlify.yaml          |  4 ++--
 .github/workflows/tests.yml             |  4 ++--
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/element-web.yaml b/.github/workflows/element-web.yaml
index de082badb2..8ac5e2da94 100644
--- a/.github/workflows/element-web.yaml
+++ b/.github/workflows/element-web.yaml
@@ -82,7 +82,7 @@ jobs:
                   git rev-parse HEAD > element-web/webapp/sha
 
             - name: Upload Artifact
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: previewbuild
                   path: element-web/webapp
diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml
index abaa593070..7390d4229b 100644
--- a/.github/workflows/end-to-end-tests.yaml
+++ b/.github/workflows/end-to-end-tests.yaml
@@ -51,12 +51,10 @@ jobs:
                 # Run multiple instances in parallel to speed up the tests
                 runner: [1, 2, 3, 4, 5, 6, 7, 8]
         steps:
-            # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
-            # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
             - name: 📥 Download artifact
-              uses: dawidd6/action-download-artifact@f29d1b6a8930683e80acedfbe6baa2930cd646b4 # v2
+              uses: actions/download-artifact@v4
               with:
-                  run_id: ${{ github.event.workflow_run.id }}
+                  run-id: ${{ github.event.workflow_run.id }}
                   name: previewbuild
                   path: webapp
 
@@ -118,9 +116,9 @@ jobs:
 
             - name: Upload blob report to GitHub Actions Artifacts
               if: always()
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: all-blob-reports
+                  name: all-blob-reports-${{ matrix.runner }}
                   path: matrix-react-sdk/blob-report
                   retention-days: 1
 
@@ -147,16 +145,17 @@ jobs:
               run: yarn install --frozen-lockfile
 
             - name: Download blob reports from GitHub Actions Artifacts
-              uses: actions/download-artifact@v3
+              uses: actions/download-artifact@v4
               with:
-                  name: all-blob-reports
+                  pattern: all-blob-reports-*
                   path: all-blob-reports
+                  merge-multiple: true
 
             - name: Merge into HTML Report
               run: yarn playwright merge-reports --reporter=html,github ./all-blob-reports
 
             - name: Upload HTML report
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
                   name: html-report--attempt-${{ github.run_attempt }}
                   path: playwright-report
diff --git a/.github/workflows/netlify.yaml b/.github/workflows/netlify.yaml
index ab9c85caa5..ea63861959 100644
--- a/.github/workflows/netlify.yaml
+++ b/.github/workflows/netlify.yaml
@@ -27,9 +27,9 @@ jobs:
             # There's a 'download artifact' action, but it hasn't been updated for the workflow_run action
             # (https://github.com/actions/download-artifact/issues/60) so instead we get this mess:
             - name: 📥 Download artifact
-              uses: dawidd6/action-download-artifact@f29d1b6a8930683e80acedfbe6baa2930cd646b4 # v2
+              uses: actions/download-artifact@v4
               with:
-                  run_id: ${{ github.event.workflow_run.id }}
+                  run-id: ${{ github.event.workflow_run.id }}
                   name: previewbuild
                   path: webapp
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5767c9525f..c92f6ede24 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -81,9 +81,9 @@ jobs:
 
             - name: Upload Artifact
               if: env.ENABLE_COVERAGE == 'true'
-              uses: actions/upload-artifact@v3
+              uses: actions/upload-artifact@v4
               with:
-                  name: coverage
+                  name: coverage-${{ matrix.runner }}
                   path: |
                       coverage
                       !coverage/lcov-report