PORTALS-3380

Sage-Bionetworks · Jan 23, 2025 · 0f2e135 · 0f2e135
1 parent a212030
commit 0f2e135
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -46,7 +46,7 @@ jobs:
           NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
       - name: Upload test report
         if: success() || steps.test.conclusion == 'failure'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results
           path: |

diff --git a/.github/workflows/end-to-end-test-portals.yml b/.github/workflows/end-to-end-test-portals.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
     branches: [main]
 env:
-  PW_ALL_BLOBS_DIR: all-blob-reports
+  PW_ALL_BLOBS_DIR: playwright-result-blob-
   PORTALS_E2E_SUBDIR: apps/portals-e2e
 concurrency:
   group: '${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}'
@@ -50,10 +50,10 @@ jobs:
         env:
           PORTAL: ${{ matrix.PORTAL }}
       - name: Upload blob report to GitHub Actions Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: ${{ env.PW_ALL_BLOBS_DIR }}
+          name: ${{ env.PW_ALL_BLOBS_DIR }}${{ matrix.PORTAL }}
           path: '${{ env.PORTALS_E2E_SUBDIR }}/blob-report'
           retention-days: 1
   merge-e2e-reports:
@@ -63,20 +63,20 @@ jobs:
     needs: [e2e-tests]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/checkout@v4
+      - uses: actions/upload-artifact/merge@v4
         with:
           fetch-depth: 0
       - uses: ./.github/actions/pnpm-setup-action
       - name: Download blob reports from GitHub Actions Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.PW_ALL_BLOBS_DIR }}
+          pattern: ${{ env.PW_ALL_BLOBS_DIR }}*
           path: ${{ env.PORTALS_E2E_SUBDIR }}/${{ env.PW_ALL_BLOBS_DIR }}
+          merge-multiple: true
       - name: Merge into HTML Report
         run: cd ${{ env.PORTALS_E2E_SUBDIR }}; pnpm exec playwright merge-reports --reporter html ./"${{ env.PW_ALL_BLOBS_DIR }}"
       - name: Upload HTML report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: html-report--attempt-${{ github.run_attempt }}
           path: '${{ env.PORTALS_E2E_SUBDIR }}/playwright-report'