diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-07-19 12:19:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 12:19:24 -0400 |
| commit | 908a642063fc5b024b19e732636165c2cb82c00a (patch) | |
| tree | 8cc4595e1ac1457eaa9b173c19d29432fd243baf | |
| parent | 48db1ed65ef8fba536d6971f1c9df857044288f6 (diff) | |
| parent | 80423dbfb1cde7f3c45349cc847625ce57ff4388 (diff) | |
| download | servo-908a642063fc5b024b19e732636165c2cb82c00a.tar.gz servo-908a642063fc5b024b19e732636165c2cb82c00a.zip | |
Auto merge of #21209 - servo:jdm-patch-20, r=SimonSapin
Resume WPT syncing on mac builders.
This reverts https://github.com/servo/servo/pull/21148 to avoid the virtualenv problems that come with using the linux builders.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21209)
<!-- Reviewable:end -->
| -rw-r--r-- | etc/ci/buildbot_steps.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml index 12d5a318d0a..d53a76a8e27 100644 --- a/etc/ci/buildbot_steps.yml +++ b/etc/ci/buildbot_steps.yml @@ -68,6 +68,9 @@ mac-nightly: - env PKG_CONFIG_PATH=/usr/local/opt/zlib/lib/pkgconfig ./mach build --release - ./mach package --release - ./mach upload-nightly mac + - ./etc/ci/update-wpt-checkout fetch-and-update-expectations + - ./etc/ci/update-wpt-checkout open-pr + - ./etc/ci/update-wpt-checkout cleanup linux-rel-intermittent: - ./mach clean-nightlies --keep 3 --force @@ -148,9 +151,6 @@ linux-nightly: - python3 ./etc/ci/performance/download_buildbot_timings.py --verbose - aws s3 sync --size-only --acl public-read ./etc/ci/performance/output s3://servo-perf - rm -rf ./python/_virtualenv - - ./etc/ci/update-wpt-checkout fetch-and-update-expectations - - ./etc/ci/update-wpt-checkout open-pr - - ./etc/ci/update-wpt-checkout cleanup android: - ./mach clean-nightlies --keep 3 --force |