aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Matthews <josh@joshmatthews.net>2019-04-01 10:59:13 -0400
committerJosh Matthews <josh@joshmatthews.net>2019-04-01 17:13:14 -0400
commitc0052c089407128b9f2b777dedcd29b1e9ddac03 (patch)
treec3fd84cd91f211a867e346d793a1d96d99b5a6be
parent903729159e3b53beb309429c15875c8f2822f5da (diff)
downloadservo-c0052c089407128b9f2b777dedcd29b1e9ddac03.tar.gz
servo-c0052c089407128b9f2b777dedcd29b1e9ddac03.zip
Install virtualenv python module.
-rw-r--r--.travis.yml2
-rw-r--r--etc/taskcluster/docker/base.dockerfile6
2 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 50fe71dc85c..e586dc8d928 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ matrix:
- sudo: false
before_install:
- curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y
+ - pip install virtualenv
- source ~/.profile
script:
- ./mach test-tidy --no-progress --all
@@ -20,6 +21,7 @@ matrix:
- sudo add-apt-repository 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.9 main' -y
- sudo apt-get update -q
- sudo apt-get install clang-3.9 llvm-3.9 llvm-3.9-runtime libunwind8-dev -y
+ - pip install virtualenv
- curl -L http://servo-deps.s3.amazonaws.com/gstreamer/gstreamer-1.14-x86_64-linux-gnu.20190213.tar.gz | tar xz
- sed -i "s;prefix=/opt/gst;prefix=$PWD/gst;g" $PWD/gst/lib/pkgconfig/*.pc
- export PKG_CONFIG_PATH=$PWD/gst/lib/pkgconfig
diff --git a/etc/taskcluster/docker/base.dockerfile b/etc/taskcluster/docker/base.dockerfile
index 0d9385f4054..d3d940ce7f9 100644
--- a/etc/taskcluster/docker/base.dockerfile
+++ b/etc/taskcluster/docker/base.dockerfile
@@ -16,8 +16,10 @@ RUN \
#
# Running mach
python \
- virtualenv \
+ python-pip \
#
# Installing rustup and sccache (build dockerfile) or fetching build artifacts (run tasks)
- curl
+ curl && \
+ # Running mach
+ pip install virtualenv