Skip to content

Commit

Permalink
Auto merge of #21209 - servo:jdm-patch-20, r=SimonSapin
Browse files Browse the repository at this point in the history
Resume WPT syncing on mac builders.

This reverts #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 -->
  • Loading branch information
bors-servo committed Jul 19, 2018
2 parents 48db1ed + 80423db commit 908a642
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions etc/ci/buildbot_steps.yml
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 908a642

Please sign in to comment.