ci: Switch to version 4 of GitHub artifact actions (#31357)

* ci: Switch to version 4 of GitHub artifact actions

This switches to version 4 of the GitHub artifact actions, which
requires producing a single artifact per job and adding merge steps. In
addition, the names of artifacts are standardized:

- Build: <profile>-binary-<platform>
- Full WPT results (only on failure): wpt-full-logs-<platform>-<layout>
- Filtered WPT results (only on failure): wpt-filtered-logs-<platform>-<layout>

* Delete merged build timings and combine with Result job

* Always archives logs even after test failures

* Correct the name of the log files for WPT import

.github/workflows/mac-wpt.yml

@@ -41,9 +41,9 @@ jobs:
         with:
           ref: refs/pull/${{ github.event.number }}/head
           fetch-depth: 2
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
-          name: release-binary-macos
+          name: ${{ inputs.profile }}-binary-macos
       - name: Prep test environment
         run: |
           gtar -xzf target.tar.gz
@@ -53,53 +53,60 @@ jobs:
         run: python3 ./mach smoketest --${{ inputs.profile }}
       - name: Run tests
         run: |
+          mkdir -p wpt-filtered-logs/macos-${{ inputs.wpt-layout }}
+          mkdir -p wpt-full-logs/macos-${{ inputs.wpt-layout }}
           python3 ./mach test-wpt $WPT_COMMAND_LINE_ARG ${{ inputs.wpt-tests-to-run }} \
             --${{ inputs.profile }} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
-            --log-raw test-wpt.${{ matrix.chunk_id }}.log \
-            --log-raw-unexpected unexpected-test-wpt.${{ matrix.chunk_id }}.log \
-            --filter-intermittents filtered-test-wpt.${{ matrix.chunk_id }}.json
-      - name: Archive filtered results
-        uses: actions/upload-artifact@v3
-        if: always()
+            --log-raw wpt-full-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
+            --log-raw-unexpected wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
+            --filter-intermittents wpt-filtered-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json
+      - name: Archive results (filtered)
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
         with:
-          name: wpt-filtered-results-mac-${{ inputs.wpt-layout }}
-          path: |
-            filtered-test-wpt.${{ matrix.chunk_id }}.json
-            unexpected-test-wpt.${{ matrix.chunk_id }}.log
-      - name: Archive logs
-        uses: actions/upload-artifact@v3
-        if: failure()
+          name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }}
+          path: wpt-filtered-logs/*/
+      - name: Archive results (full)
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
         with:
-          name: wpt-logs-mac-${{ inputs.wpt-layout }}
-          path: |
-            test-wpt.${{ matrix.chunk_id }}.log
-            filtered-wpt-results.${{ matrix.chunk_id }}.json
+          name: wpt-full-logs-macos-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }}
+          path: wpt-full-logs/*/
 
   report-test-results:
-    name: Reporting test results
+    name: Process WPT Results
     runs-on: ubuntu-latest
-    if: ${{ always() && !cancelled() }}
-    needs: [ mac-wpt ]
+    if: ${{ always() }}
+    needs: mac-wpt
     steps:
+      - name: Merge logs (filtered)
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}
+          pattern: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}-*
+          delete-merged: true
+      - name: Merge logs (full)
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: wpt-full-logs-macos-${{ inputs.wpt-layout }}
+          pattern: wpt-full-logs-macos-${{ inputs.wpt-layout }}-*
+          delete-merged: true
       - uses: actions/checkout@v3
+        if: ${{ !cancelled() }}
         with:
           fetch-depth: 2
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        if: ${{ !cancelled() }}
         with:
-          name: wpt-filtered-results-mac-${{ inputs.wpt-layout }}
-          path: wpt-filtered-results-mac
-      - name: Create aggregated unexpected results
-        run: cat wpt-filtered-results-mac/*.log > unexpected-test-wpt.log
-      - name: Archive aggregate results
-        uses: actions/upload-artifact@v3
-        with:
-          name: wpt-filtered-results-mac-${{ inputs.wpt-layout }}
-          path: |
-            unexpected-test-wpt.log
-      - name: Comment on PR with results
-        run: etc/ci/report_aggregated_expected_results.py --tag="mac-wpt-${{ inputs.wpt-layout }}"
-          wpt-filtered-results-mac/*.json
+          name: wpt-filtered-logs-macos-${{ inputs.wpt-layout }}
+          path: results
+      - name: Report results
+        if: ${{ !cancelled() }}
+        run: |
+          etc/ci/report_aggregated_expected_results.py \
+            --tag="macos-wpt-${{ inputs.wpt-layout }}" \
+            results/macos-${{ inputs.wpt-layout }}/*.json
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}