mirror of
https://github.com/servo/servo.git
synced 2025-08-12 08:55:32 +01:00
Auto merge of #29980 - mrobinson:splitoff, r=mrobinson
Split the WPT workflow from the Linux one This allows running tests for only one layout system at a time. This was originally part of #29950, but was lost in the shuffle. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they improve the CI. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
bors-servo
GitHub
commit
1543912589
3 changed files with 146 additions and 111 deletions
121
.github/workflows/linux-wpt.yml
vendored
Normal file
121
.github/workflows/linux-wpt.yml
vendored
Normal file
|
|
@ -0,0 +1,121 @@
|
|||
name: Linux WPT workflow
|
||||
on:
|
||||
workflow_call:
|
||||
inputs:
|
||||
wpt:
|
||||
required: false
|
||||
type: string
|
||||
layout:
|
||||
required: true
|
||||
type: string
|
||||
|
||||
env:
|
||||
RUST_BACKTRACE: 1
|
||||
SHELL: /bin/bash
|
||||
|
||||
jobs:
|
||||
linux-wpt:
|
||||
name: Linux WPT Tests ${{ inputs.layout }}
|
||||
runs-on: ubuntu-20.04
|
||||
env:
|
||||
max_chunk_id: 20
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 2
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: release-binary
|
||||
path: release-binary
|
||||
- name: unPackage binary
|
||||
run: tar -xzf release-binary/target.tar.gz
|
||||
- name: Prep test environment
|
||||
run: |
|
||||
python3 -m pip install --upgrade pip virtualenv
|
||||
sudo apt update
|
||||
sudo apt install -qy --no-install-recommends libgl1 libssl1.1 libdbus-1-3 libxcb-xfixes0-dev libxcb-shape0-dev libunwind8 libegl1-mesa
|
||||
wget http://mirrors.kernel.org/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
|
||||
sudo apt install ./libffi6_3.2.1-8_amd64.deb
|
||||
python3 ./mach bootstrap-gstreamer
|
||||
- name: Fetch upstream changes before testing
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
run: |
|
||||
./etc/ci/update-wpt-checkout fetch-upstream-changes
|
||||
- name: Run tests
|
||||
if: ${{ inputs.wpt != 'sync' }}
|
||||
run: |
|
||||
python3 ./mach test-wpt --with-${{ inputs.layout }} \
|
||||
--release --processes $(nproc) --timeout-multiplier 2 \
|
||||
--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
|
||||
env:
|
||||
GITHUB_CONTEXT: ${{ toJson(github) }}
|
||||
INTERMITTENT_TRACKER_DASHBOARD_SECRET: ${{ secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET }}
|
||||
- name: Run tests (sync)
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
run: |
|
||||
python3 ./mach test-wpt --with-${{ inputs.layout }} \
|
||||
--release --processes $(nproc) --timeout-multiplier 2 \
|
||||
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
|
||||
--log-raw test-wpt.${{ matrix.chunk_id }}.log \
|
||||
--always-succeed
|
||||
- name: Archive filtered results
|
||||
uses: actions/upload-artifact@v3
|
||||
if: ${{ always() && inputs.wpt != 'sync' }}
|
||||
with:
|
||||
name: wpt-filtered-results-linux-${{ inputs.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() && inputs.wpt != 'sync' }}
|
||||
with:
|
||||
name: wpt-logs-linux-${{ inputs.layout }}
|
||||
path: |
|
||||
test-wpt.${{ matrix.chunk_id }}.log
|
||||
- name: Archive logs
|
||||
uses: actions/upload-artifact@v3
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
with:
|
||||
name: wpt-logs-linux-${{ inputs.layout }}
|
||||
path: |
|
||||
test-wpt.${{ matrix.chunk_id }}.log
|
||||
wpt-jsonsummary.${{ matrix.chunk_id }}.log
|
||||
|
||||
report-test-results:
|
||||
name: Reporting test results
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ always() && !cancelled() && (github.ref_name == 'try-wpt' || github.ref_name == 'try-wpt-2020' || inputs.wpt == 'test') }}
|
||||
needs:
|
||||
- "linux-wpt"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 2
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: wpt-filtered-results-linux-${{ inputs.layout }}
|
||||
path: wpt-filtered-results-linux
|
||||
- name: Create aggregated unexpected results
|
||||
run: |
|
||||
cat wpt-filtered-results-linux/*.log > unexpected-test-wpt-${{ inputs.layout }}.log
|
||||
- name: Archive aggregate results
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: wpt-filtered-results-linux
|
||||
path: |
|
||||
unexpected-test-wpt-${{ inputs.layout }}.log
|
||||
- name: Comment on PR with results
|
||||
run: |
|
||||
etc/ci/report_aggregated_expected_results.py --tag="linux-wpt-${{ inputs.layout }}" wpt-filtered-results-linux/*.json
|
||||
env:
|
||||
GITHUB_CONTEXT: ${{ toJson(github) }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
RESULTS: ${{ toJson(needs.*.result) }}
|
||||
131
.github/workflows/linux.yml
vendored
131
.github/workflows/linux.yml
vendored
|
|
@ -5,6 +5,9 @@ on:
|
|||
wpt:
|
||||
required: false
|
||||
type: string
|
||||
layout:
|
||||
required: false
|
||||
type: string
|
||||
unit-tests:
|
||||
required: false
|
||||
default: false
|
||||
|
|
@ -23,6 +26,10 @@ on:
|
|||
required: false
|
||||
type: choice
|
||||
options: ["test", "sync"]
|
||||
layout:
|
||||
required: false
|
||||
type: choice
|
||||
options: ["2013", "2020", "all"]
|
||||
unit-tests:
|
||||
required: false
|
||||
default: false
|
||||
|
|
@ -106,117 +113,23 @@ jobs:
|
|||
name: release-binary
|
||||
path: target.tar.gz
|
||||
|
||||
linux-wpt:
|
||||
if: ${{ github.ref_name == 'try-wpt' || github.ref_name == 'try-wpt-2020' || inputs.wpt }}
|
||||
name: Linux WPT Tests
|
||||
runs-on: ubuntu-20.04
|
||||
linux-wpt-2020:
|
||||
if: ${{ github.ref_name == 'try-wpt-2020' || inputs.layout == '2020' || inputs.layout == 'all' }}
|
||||
name: Linux WPT Tests 2020
|
||||
needs: ["build-linux"]
|
||||
env:
|
||||
max_chunk_id: 20
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
layout: ["layout-2020", "layout-2013"]
|
||||
chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
uses: ./.github/workflows/linux-wpt.yml
|
||||
with:
|
||||
fetch-depth: 2
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: release-binary
|
||||
path: release-binary
|
||||
- name: unPackage binary
|
||||
run: tar -xzf release-binary/target.tar.gz
|
||||
- name: Prep test environment
|
||||
run: |
|
||||
python3 -m pip install --upgrade pip virtualenv
|
||||
sudo apt update
|
||||
sudo apt install -qy --no-install-recommends libgl1 libssl1.1 libdbus-1-3 libxcb-xfixes0-dev libxcb-shape0-dev libunwind8 libegl1-mesa
|
||||
wget http://mirrors.kernel.org/ubuntu/pool/main/libf/libffi/libffi6_3.2.1-8_amd64.deb
|
||||
sudo apt install ./libffi6_3.2.1-8_amd64.deb
|
||||
python3 ./mach bootstrap-gstreamer
|
||||
- name: Fetch upstream changes before testing
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
run: |
|
||||
./etc/ci/update-wpt-checkout fetch-upstream-changes
|
||||
- name: Run tests
|
||||
if: ${{ inputs.wpt != 'sync' }}
|
||||
run: |
|
||||
python3 ./mach test-wpt --with-${{ matrix.layout }} \
|
||||
--release --processes $(nproc) --timeout-multiplier 2 \
|
||||
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
|
||||
--log-raw test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.log \
|
||||
--log-raw-unexpected unexpected-test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.log \
|
||||
--filter-intermittents filtered-test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.json
|
||||
env:
|
||||
GITHUB_CONTEXT: ${{ toJson(github) }}
|
||||
INTERMITTENT_TRACKER_DASHBOARD_SECRET: ${{ secrets.INTERMITTENT_TRACKER_DASHBOARD_SECRET }}
|
||||
- name: Run tests (sync)
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
run: |
|
||||
python3 ./mach test-wpt --with-${{ matrix.layout }} \
|
||||
--release --processes $(nproc) --timeout-multiplier 2 \
|
||||
--total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
|
||||
--log-raw test-wpt.${{ matrix.chunk_id }}.log \
|
||||
--always-succeed
|
||||
- name: Archive filtered results
|
||||
uses: actions/upload-artifact@v3
|
||||
if: ${{ always() && inputs.wpt != 'sync' }}
|
||||
with:
|
||||
name: wpt-filtered-results-linux
|
||||
path: |
|
||||
filtered-test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.json
|
||||
unexpected-test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.log
|
||||
- name: Archive logs
|
||||
uses: actions/upload-artifact@v3
|
||||
if: ${{ failure() && inputs.wpt != 'sync' }}
|
||||
with:
|
||||
name: wpt-logs-linux
|
||||
path: |
|
||||
test-wpt-${{ matrix.layout }}.${{ matrix.chunk_id }}.log
|
||||
- name: Archive logs
|
||||
uses: actions/upload-artifact@v3
|
||||
if: ${{ inputs.wpt == 'sync' }}
|
||||
with:
|
||||
name: wpt-logs-linux-${{ matrix.layout }}
|
||||
path: |
|
||||
test-wpt.${{ matrix.chunk_id }}.log
|
||||
wpt-jsonsummary.${{ matrix.chunk_id }}.log
|
||||
wpt: ${{ inputs.wpt }}
|
||||
layout: "layout-2020"
|
||||
|
||||
report-test-results:
|
||||
name: Reporting test results
|
||||
runs-on: ubuntu-latest
|
||||
if: ${{ always() && !cancelled() && success('build-linux') && (github.ref_name == 'try-wpt' || github.ref_name == 'try-wpt-2020' || inputs.wpt == 'test') }}
|
||||
needs:
|
||||
- "linux-wpt"
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
linux-wpt-2013:
|
||||
if: ${{ github.ref_name == 'try-wpt' || inputs.layout == '2013' || inputs.layout == 'all' }}
|
||||
name: Linux WPT Tests 2013
|
||||
needs: ["build-linux"]
|
||||
uses: ./.github/workflows/linux-wpt.yml
|
||||
with:
|
||||
fetch-depth: 2
|
||||
- uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: wpt-filtered-results-linux
|
||||
path: wpt-filtered-results-linux
|
||||
- name: Create aggregated unexpected results
|
||||
run: |
|
||||
cat wpt-filtered-results-linux/*-layout-2020.*.log > unexpected-test-wpt-layout-2020.log
|
||||
cat wpt-filtered-results-linux/*-layout-2013.*.log > unexpected-test-wpt-layout-2013.log
|
||||
- name: Archive aggregate results
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: wpt-filtered-results-linux
|
||||
path: |
|
||||
unexpected-test-wpt-layout-2020.log
|
||||
unexpected-test-wpt-layout-2013.log
|
||||
- name: Comment on PR with results
|
||||
run: |
|
||||
etc/ci/report_aggregated_expected_results.py --tag="linux-wpt-2020" wpt-filtered-results-linux/*-layout-2020.*.json
|
||||
etc/ci/report_aggregated_expected_results.py --tag="linux-wpt-2013" wpt-filtered-results-linux/*-layout-2013.*.json
|
||||
env:
|
||||
GITHUB_CONTEXT: ${{ toJson(github) }}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
RESULTS: ${{ toJson(needs.*.result) }}
|
||||
wpt: ${{ inputs.wpt }}
|
||||
layout: "layout-2013"
|
||||
|
||||
build_result:
|
||||
name: homu build finished
|
||||
|
|
@ -225,8 +138,8 @@ jobs:
|
|||
# needs all build to detect cancellation
|
||||
needs:
|
||||
- "build-linux"
|
||||
- "linux-wpt"
|
||||
- "report-test-results"
|
||||
- "linux-wpt-2020"
|
||||
- "linux-wpt-2013"
|
||||
|
||||
steps:
|
||||
- name: Mark the job as successful
|
||||
|
|
|
|||
1
.github/workflows/main.yml
vendored
1
.github/workflows/main.yml
vendored
|
|
@ -53,6 +53,7 @@ jobs:
|
|||
uses: ./.github/workflows/linux.yml
|
||||
with:
|
||||
wpt: 'test'
|
||||
layout: 'all'
|
||||
unit-tests: true
|
||||
|
||||
build_result:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue