From 2e3e092f1931ce5e2c3b15380ca086609148cd84 Mon Sep 17 00:00:00 2001
From: Kelechi Ebiri <56020538+TG199@users.noreply.github.com>
Date: Thu, 20 Mar 2025 11:52:19 +0100
Subject: [PATCH] chore: simplify linux workflow (#36037)

* chore: simplify linux workflow

Signed-off-by: TG <ebiritg@gmail.com>

* chore: remove occurances of wpt-layout

Signed-off-by: TG <ebiritg@gmail.com>

* chore: remove invalid workflow in main.yml file

Signed-off-by: TG <ebiritg@gmail.com>

* chore: retain wpt-layout workflow as requested

Signed-off-by: TG <ebiritg@gmail.com>

---------

Signed-off-by: TG <ebiritg@gmail.com>
---
 .github/workflows/linux-wpt.yml | 35 +++++++++++++++------------------
 .github/workflows/linux.yml     |  1 -
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/linux-wpt.yml b/.github/workflows/linux-wpt.yml
index 061fbc2f6b4..03dce7456b2 100644
--- a/.github/workflows/linux-wpt.yml
+++ b/.github/workflows/linux-wpt.yml
@@ -13,9 +13,6 @@ on:
         default: false
         required: false
         type: boolean
-      wpt-layout:
-        required: true
-        type: string
 
 env:
   RUST_BACKTRACE: 1
@@ -28,7 +25,7 @@ env:
 
 jobs:
   linux-wpt:
-    name: WPT ${{ inputs.wpt-layout }}
+    name: WPT
     runs-on: ubuntu-22.04
     env:
       max_chunk_id: 20
@@ -64,16 +61,16 @@ jobs:
           ./mach update-wpt --sync --patch
       - name: Run tests
         run: |
-          mkdir -p wpt-filtered-logs/linux-${{ inputs.wpt-layout }}
-          mkdir -p wpt-full-logs/linux-${{ inputs.wpt-layout }}
+          mkdir -p wpt-filtered-logs/linux
+          mkdir -p wpt-full-logs/linux
           ./mach test-wpt \
             $WPT_ALWAYS_SUCCEED_ARG \
             --${{ inputs.profile }} --processes $(nproc) --timeout-multiplier 2 \
             --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
-            --log-raw wpt-full-logs/linux-${{ inputs.wpt-layout }}/raw/${{ matrix.chunk_id }}.log \
-            --log-wptreport wpt-full-logs/linux-${{ inputs.wpt-layout }}/wptreport/${{ matrix.chunk_id }}.json \
-            --log-raw-unexpected wpt-filtered-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \
-            --filter-intermittents wpt-filtered-logs/linux-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.json \
+            --log-raw wpt-full-logs/linux/raw/${{ matrix.chunk_id }}.log \
+            --log-wptreport wpt-full-logs/linux/wptreport/${{ matrix.chunk_id }}.json \
+            --log-raw-unexpected wpt-filtered-logs/linux/${{ matrix.chunk_id }}.log \
+            --filter-intermittents wpt-filtered-logs/linux/${{ matrix.chunk_id }}.json \
             ${{ inputs.wpt-args }}
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
@@ -81,13 +78,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }}
+          name: wpt-filtered-logs-linux-${{ matrix.chunk_id }}
           path: wpt-filtered-logs/*/
       - name: Archive results (full)
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: wpt-full-logs-linux-${{ inputs.wpt-layout }}-${{ matrix.chunk_id }}
+          name: wpt-full-logs-linux-${{ matrix.chunk_id }}
           path: wpt-full-logs/*/
 
   report-test-results:
@@ -99,29 +96,29 @@ jobs:
       - name: Merge logs (full)
         uses: actions/upload-artifact/merge@v4
         with:
-          name: wpt-full-logs-linux-${{ inputs.wpt-layout }}
-          pattern: wpt-full-logs-linux-${{ inputs.wpt-layout }}-*
+          name: wpt-full-logs-linux
+          pattern: wpt-full-logs-linux-*
           delete-merged: true
       # This job needs to be last. If no filtered results were uploaded, it will fail, but we want to merge other archives in that case.
       - name: Merge logs (filtered)
         uses: actions/upload-artifact/merge@v4
         with:
-          name: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}
-          pattern: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}-*
+          name: wpt-filtered-logs-linux
+          pattern: wpt-filtered-logs-linux-*
           delete-merged: true
       - uses: actions/checkout@v4
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
       - uses: actions/download-artifact@v4
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
         with:
-          name: wpt-filtered-logs-linux-${{ inputs.wpt-layout }}
+          name: wpt-filtered-logs-linux
           path: results
       - name: Report results
         if: ${{ !cancelled() && !inputs.wpt-sync-from-upstream }}
         run: |
           etc/ci/report_aggregated_expected_results.py \
-            --tag="linux-wpt-${{ inputs.wpt-layout }}" \
-            results/linux-${{ inputs.wpt-layout }}/*.json
+            --tag="linux-wpt" \
+            results/linux/*.json
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index f50a6ee2bc7..fb677ff6a14 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -224,7 +224,6 @@ jobs:
       wpt-args: ${{ inputs.wpt-args }}
       profile: ${{ inputs.profile }}
       wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }}
-      wpt-layout: "layout-2020"
     secrets: inherit
 
   bencher: