Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #29201 - delan:ci-mac-wpt, r=jdm

Browse source 
CI: run WPT tests on macOS

This patch uncomments and fixes the mac-wpt job in the main workflow, with a few changes:

* we downgrade python3 and pip3 to 3.9, because inspect.getargspec was [removed in 3.11](https://docs.python.org/3/whatsnew/3.11.html#removed)
    * we should apparently move to [inspect.getfullargspec](https://docs.python.org/3/library/inspect.html#inspect.getfullargspec)
* we download the real Servo artifact, rather than the fake Servo for testing

We also align the rest of the job (other than `--timeout-multiplier`) to be as close as possible to linux-wpt, based on the assumption that linux-wpt is more up to date. This includes:

* setting strategy.fail-fast to false
* adding a failure() condition to the “Archive logs” step
* adding the chunk id to log filenames

There are some failing WPT tests, so for now the job is not required to succeed.

Example run: <https://github.com/delan/servo/actions/runs/3837530905>

---

- [ ] ~~`./mach build -d` does not report any errors~~
- [ ] ~~`./mach test-tidy` does not report any errors~~
- [x] These changes fix #28284 (GitHub issue number if applicable)

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they affect the CI configuration
This commit is contained in:
bors-servo 2023-01-12 14:23:47 +01:00 • committed by GitHub
commit 806db676b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 57 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

110
.github/workflows/main.yml vendored
View file

@ -157,59 +157,62 @@ jobs:
name: release-binary-macos name: release-binary-macos
path: target.tar.gz path: target.tar.gz
# mac-wpt: mac-wpt:
# #needs: build-mac name: Mac WPT Tests
# runs-on: macos-10.12 runs-on: macos-12
# env: needs: ["build-mac"]
# max_chunk_id: 20 env:
# strategy: max_chunk_id: 20
# matrix: strategy:
# chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20] fail-fast: false
# steps: matrix:
# - uses: actions/checkout@v3 chunk_id: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20]
# with: steps:
# fetch-depth: 2 - uses: actions/checkout@v3
# with:
# #- name: Download release binary fetch-depth: 2
# # uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
# # with: with:
# # name: release-binary-macos name: release-binary-macos
# # TODO: Remove this step when the compatibility issue between mozjs and
# - name: Fake build # Homebrew's Python 3.10 formula (servo/rust-mozjs#559) is fixed
# run: | - name: Select Python 3.9
# wget https://joshmatthews.net/release-binary-macos.zip run: |
# unzip release-binary-macos.zip brew install python@3.9
# cd $(dirname $(which python3.9))
# - name: Prep test environment rm -f python3 pip3
# run: | ln -s python3.9 python3
# brew install gnu-tar ln -s pip3.9 pip3
# gtar -xzf target.tar.gz - name: Prep test environment
# python3 -m pip install --upgrade pip virtualenv run: |
# brew bundle install --verbose --no-upgrade --file=etc/taskcluster/macos/Brewfile gtar -xzf target.tar.gz
# - name: Smoketest python3 -m pip install --upgrade pip virtualenv
# run: python3 ./mach smoketest brew bundle install --verbose --no-upgrade --file=etc/taskcluster/macos/Brewfile
# - name: Run tests - name: Smoketest
# run: | run: python3 ./mach smoketest
# python3 ./mach test-wpt \ - name: Run tests
# --release --processes=3 --timeout-multiplier=8 \ run: |
# --total-chunks=${{ env.max_chunk_id }} --this-chunk=${{ matrix.chunk_id }} \ python3 ./mach test-wpt \
# --log-raw=test-wpt.log \ --release --processes $(sysctl -n hw.logicalcpu) --timeout-multiplier 8 \
# --log-servojson=wpt-jsonsummary.log \ --total-chunks ${{ env.max_chunk_id }} --this-chunk ${{ matrix.chunk_id }} \
# --always-succeed | cat --log-raw test-wpt.${{ matrix.chunk_id }}.log \
# python3 ./mach filter-intermittents wpt-jsonsummary.log \ --log-servojson wpt-jsonsummary.${{ matrix.chunk_id }}.log \
# --log-intermittents=intermittents.log \ --always-succeed
# --log-filteredsummary=filtered-wpt-summary.log \ python3 ./mach filter-intermittents wpt-jsonsummary.${{ matrix.chunk_id }}.log \
# --tracker-api=default --reporter-api=default --log-intermittents=intermittents.${{ matrix.chunk_id }}.log \
# --log-filteredsummary=filtered-wpt-summary.${{ matrix.chunk_id }}.log \
# - name: Archive logs --tracker-api=default --reporter-api=default
# uses: actions/upload-artifact@v3
# with: - name: Archive logs
# name: wpt${{ matrix.chunk_id }}-logs-macos uses: actions/upload-artifact@v3
# path: | if: ${{ failure() }}
# test-wpt.log with:
# wpt-jsonsummary.log name: wpt${{ matrix.chunk_id }}-logs-macos
# filtered-wpt-summary.log path: |
# intermittents.log test-wpt.${{ matrix.chunk_id }}.log
wpt-jsonsummary.${{ matrix.chunk_id }}.log
filtered-wpt-summary.${{ matrix.chunk_id }}.log
intermittents.${{ matrix.chunk_id }}.log
build-linux: build-linux:
name: Build (Linux) name: Build (Linux)
@ -298,6 +301,7 @@ jobs:
- "build-linux" - "build-linux"
- "build-mac" - "build-mac"
- "linux-wpt" - "linux-wpt"
# - "mac-wpt"
steps: steps:
- name: Mark the job as successful - name: Mark the job as successful