mirror of
https://github.com/servo/servo.git
synced 2025-07-22 23:03:42 +01:00
Change github workflows to not compile legacy layout (#35946)
Since it will be removed in #35943 Signed-off-by: Oriol Brufau <obrufau@igalia.com>
This commit is contained in:
parent
1c60c0b62e
commit
e2daeeaceb
6 changed files with 5 additions and 36 deletions
2
.github/workflows/linux-wpt.yml
vendored
2
.github/workflows/linux-wpt.yml
vendored
|
@ -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 }} \
|
||||
|
|
16
.github/workflows/linux.yml
vendored
16
.github/workflows/linux.yml
vendored
|
@ -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' }}
|
||||
|
|
3
.github/workflows/mac-wpt.yml
vendored
3
.github/workflows/mac-wpt.yml
vendored
|
@ -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 \
|
||||
|
|
13
.github/workflows/mac.yml
vendored
13
.github/workflows/mac.yml
vendored
|
@ -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' }}
|
||||
|
|
5
.github/workflows/scheduled-wpt-import.yml
vendored
5
.github/workflows/scheduled-wpt-import.yml
vendored
|
@ -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
|
||||
|
|
2
.github/workflows/try.yml
vendored
2
.github/workflows/try.yml
vendored
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue