From cc1ccf8affc87f0fa6ca0225b6b78d1cbdbd5355 Mon Sep 17 00:00:00 2001
From: Martin Robinson <mrobinson@igalia.com>
Date: Thu, 2 Feb 2023 15:45:57 +0100
Subject: [PATCH] ci: Produce a single WPT log artifact

GitHub supports adding files to an artifact in parallel, as long as the
filenames are unique. This makes it easier to download build results
when more than a single builder fails.
---
 .github/workflows/main.yml        | 2 +-
 .github/workflows/wpt-nightly.yml | 2 +-
 etc/ci/wpt-nightly-update.sh      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 079e51c7121..2aeed661b3d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -224,7 +224,7 @@ jobs:
         uses: actions/upload-artifact@v3
         if: ${{ failure() }}
         with:
-          name: wpt${{ matrix.chunk_id }}-logs-linux
+          name: wpt-logs-linux
           path: |
             test-wpt.${{ matrix.chunk_id }}.log
             wpt-jsonsummary.${{ matrix.chunk_id }}.log
diff --git a/.github/workflows/wpt-nightly.yml b/.github/workflows/wpt-nightly.yml
index b857cbcb87c..c40b8b1236f 100644
--- a/.github/workflows/wpt-nightly.yml
+++ b/.github/workflows/wpt-nightly.yml
@@ -76,7 +76,7 @@ jobs:
       - name: Archive logs
         uses: actions/upload-artifact@v3
         with:
-          name: wpt${{ matrix.chunk_id }}-logs-linux
+          name: wpt-logs-linux
           path: |
             test-wpt.${{ matrix.chunk_id }}.log
             wpt-jsonsummary.${{ matrix.chunk_id }}.log
diff --git a/etc/ci/wpt-nightly-update.sh b/etc/ci/wpt-nightly-update.sh
index 3fb316e0640..6a5d363b6dc 100755
--- a/etc/ci/wpt-nightly-update.sh
+++ b/etc/ci/wpt-nightly-update.sh
@@ -31,7 +31,7 @@ function main() {
     for n in $(seq 1 "${MAX_CHUNK_ID}")
     do
         code=""
-        update_metadata "wpt${n}-logs-linux/test-wpt.${n}.log" || \
+        update_metadata "wpt-logs-linux/test-wpt.${n}.log" || \
             code="${?}"
         if [[ "${code}" != "" ]]; then
             return "${code}"