Skip to content

Commit

Permalink
Auto merge of #21167 - servo:jdm-patch-13, r=asajeffrey
Browse files Browse the repository at this point in the history
Avoid virtualenv conflicts when running nightly jobs

To avoid the errors that appear in http://build.servo.org/builders/linux-nightly/builds/750, I'm trying to keep the regular mach virtualenv and the one used for test-perf separate.

<!-- 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/21167)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Jul 12, 2018
2 parents 8af9409 + f37699d commit f01f6ae
Showing 1 changed file with 2 additions and 2 deletions.
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 --python="$(which python3)"
PS1="" source venv/bin/activate
virtualenv venv ./perf-venv --python="$(which python3)"
PS1="" source ./perf-venv/bin/activate
# `PS1` must be defined before activating virtualenv
pip install \
"boto3>=1.4.0" \
Expand Down

0 comments on commit f01f6ae

Please sign in to comment.