diff --git a/.github/workflows/linux-wpt.yml b/.github/workflows/linux-wpt.yml index 79dd24c2300..061fbc2f6b4 100644 --- a/.github/workflows/linux-wpt.yml +++ b/.github/workflows/linux-wpt.yml @@ -24,7 +24,6 @@ env: INTERMITTENT_TRACKER_DASHBOARD_SECRET: ${{ !inputs.wpt-sync-from-upstream && secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET || '' }} INTERMITTENT_TRACKER_DASHBOARD_SECRET_PROD: ${{ !inputs.wpt-sync-from-upstream && secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET_PROD || '' }} INTERMITTENT_TRACKER_DASHBOARD_SECRET_STAGING: ${{ !inputs.wpt-sync-from-upstream && secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET_STAGING || '' }} - WPT_LAYOUT_ARG: "${{ inputs.wpt-layout == 'layout-2013' && '--legacy-layout' || '' }}" WPT_ALWAYS_SUCCEED_ARG: "${{ inputs.wpt-sync-from-upstream && '--always-succeed' || '' }}" jobs: @@ -68,7 +67,6 @@ jobs: mkdir -p wpt-filtered-logs/linux-${{ inputs.wpt-layout }} mkdir -p wpt-full-logs/linux-${{ inputs.wpt-layout }} ./mach test-wpt \ - $WPT_LAYOUT_ARG \ $WPT_ALWAYS_SUCCEED_ARG \ --${{ inputs.profile }} --processes $(nproc) --timeout-multiplier 2 \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a64f5e91b00..f50a6ee2bc7 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -58,7 +58,7 @@ on: wpt-layout: required: false type: choice - options: ["none", "2013", "2020", "all"] + options: ["none", "2020", "all"] unit-tests: required: false default: false @@ -167,7 +167,7 @@ jobs: - name: Build (${{ inputs.profile }}) run: | - ./mach build --use-crown --locked --${{ inputs.profile }} --features "layout_2013" + ./mach build --use-crown --locked --${{ inputs.profile }} cp -r target/cargo-timings target/cargo-timings-linux - name: Smoketest run: xvfb-run ./mach smoketest --${{ inputs.profile }} @@ -227,18 +227,6 @@ jobs: wpt-layout: "layout-2020" secrets: inherit - wpt-2013: - if: ${{ inputs.wpt-layout == '2013' || inputs.wpt-layout == 'all' }} - name: Linux WPT (Legacy) - needs: ["build"] - uses: ./.github/workflows/linux-wpt.yml - with: - wpt-args: ${{ inputs.wpt-args }} - profile: ${{ inputs.profile }} - wpt-sync-from-upstream: ${{ inputs.wpt-sync-from-upstream }} - wpt-layout: "layout-2013" - secrets: inherit - bencher: needs: ["build"] if: ${{ inputs.bencher && inputs.profile != 'debug' && github.event_name != 'workflow_dispatch' && github.event_name != 'merge_group' }} diff --git a/.github/workflows/mac-wpt.yml b/.github/workflows/mac-wpt.yml index 6c5e527cfd4..6799e9b447c 100644 --- a/.github/workflows/mac-wpt.yml +++ b/.github/workflows/mac-wpt.yml @@ -17,7 +17,6 @@ on: env: RUST_BACKTRACE: 1 SHELL: /bin/bash - WPT_COMMAND_LINE_ARG: "${{ inputs.wpt-layout == 'layout-2013' && '--legacy-layout' || '' }}" jobs: mac-wpt: @@ -53,7 +52,7 @@ jobs: run: | mkdir -p wpt-filtered-logs/macos-${{ inputs.wpt-layout }} mkdir -p wpt-full-logs/macos-${{ inputs.wpt-layout }} - ./mach test-wpt $WPT_COMMAND_LINE_ARG \ + ./mach test-wpt \ --${{ inputs.profile }} --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \ --log-raw wpt-full-logs/macos-${{ inputs.wpt-layout }}/${{ matrix.chunk_id }}.log \ diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index bb413f50cc9..4fd5f24504a 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -51,7 +51,7 @@ on: wpt-layout: required: false type: choice - options: ["none", "2013", "2020", "all"] + options: ["none", "2020", "all"] unit-tests: required: false default: false @@ -216,17 +216,6 @@ jobs: wpt-args: ${{ inputs.wpt-args }} secrets: inherit - wpt-2013: - if: ${{ inputs.wpt-layout == '2013' || inputs.wpt-layout == 'all' }} - name: MacOS WPT (Legacy) - needs: ["build"] - uses: ./.github/workflows/mac-wpt.yml - with: - profile: ${{ inputs.profile }} - wpt-layout: "layout-2013" - wpt-args: ${{ inputs.wpt-args }} - secrets: inherit - bencher: needs: ["build"] if: ${{ inputs.bencher && inputs.profile != 'debug' && github.event_name != 'workflow_dispatch' && github.event_name != 'merge_group' }} diff --git a/.github/workflows/scheduled-wpt-import.yml b/.github/workflows/scheduled-wpt-import.yml index 02db5683853..4dcfaaf42a4 100644 --- a/.github/workflows/scheduled-wpt-import.yml +++ b/.github/workflows/scheduled-wpt-import.yml @@ -29,9 +29,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 - - uses: actions/download-artifact@v4 - with: - name: wpt-full-logs-linux-layout-2013 - uses: actions/download-artifact@v4 with: name: wpt-full-logs-linux-layout-2020 @@ -55,9 +52,7 @@ jobs: export CURRENT_DATE=$(date +"%d-%m-%Y") echo $CURRENT_DATE echo "CURRENT_DATE=$CURRENT_DATE" >> $GITHUB_ENV - ./mach update-wpt linux-layout-2013/raw/*.log --legacy-layout ./mach update-wpt linux-layout-2020/raw/*.log - git add tests/wpt/meta tests/wpt/meta-legacy-layout git commit -a --amend -s --no-edit - name: Push changes uses: ad-m/github-push-action@master diff --git a/.github/workflows/try.yml b/.github/workflows/try.yml index 6d28c751831..853d791d716 100644 --- a/.github/workflows/try.yml +++ b/.github/workflows/try.yml @@ -17,7 +17,7 @@ on: wpt-layout: required: false type: choice - options: ["none", "2013", "2020", "all"] + options: ["none", "2020", "all"] unit-tests: required: false type: boolean