Skip to content

Commit

Permalink
Auto merge of #21193 - servo:jdm-patch-17, r=asajeffrey
Browse files Browse the repository at this point in the history
Recreate virtualenv from scratch when syncing WPT

This fixes #21180 and attempts to work around #21145.

<!-- 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/21193)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jul 17, 2018
2 parents a55cbc6 + 8084cf8 commit 8866491
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions etc/ci/buildbot_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ linux-nightly:
- ./mach test-perf
- 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
Expand Down
4 changes: 2 additions & 2 deletions etc/ci/performance/test_perf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ fi
# Make sure we're running with an up-to-date warc test repo
git -C ${WARC_DIR} pull --progress

virtualenv venv ./perf-venv --python="$(which python3)"
PS1="" source ./perf-venv/bin/activate
virtualenv venv --python="$(which python3)"
PS1="" source venv/bin/activate
# `PS1` must be defined before activating virtualenv
pip install \
"boto3>=1.4.0" \
Expand Down

0 comments on commit 8866491

Please sign in to comment.