diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-10-16 14:09:36 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-10-16 14:09:36 -0600 |
commit | 628c2a04326b27ac2743771dca52612c8ce30ad2 (patch) | |
tree | 4a9b008833f895b029e2cf514c3d5ef8759fa3ff /etc | |
parent | 7a71f3932078e8248ecf8c6d28984e2fd4d1df6c (diff) | |
parent | dbe6da874b9e419b0b80a5ce7a7739ba3766d24a (diff) | |
download | servo-628c2a04326b27ac2743771dca52612c8ce30ad2.tar.gz servo-628c2a04326b27ac2743771dca52612c8ce30ad2.zip |
Auto merge of #8036 - frewsxcv:travis, r=metajack
Travis CI building cleanup, enable caching
The only reason the Dockerfile was introduced is because the default
machines that Travis uses are based on Ubuntu 12.04, which has some very
old incompatible dependencies with Servo. Docker allowed use to use a
new version of Ubuntu, allowing us to compile with ease. I just learned
that they are currently beta testing 14.04 support:
http://docs.travis-ci.com/user/trusty-ci-environment/
This commit updates our Travis config to remove our dependency on Docker
and just build directly on the images, reducing some complexity and also
overhead of downloading Docker images.
In addition, this commit also enables caching of the .servo and .cargo
directories on Travis in an attempt to reduce build times.
http://docs.travis-ci.com/user/caching/#Arbitrary-directories
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8036)
<!-- Reviewable:end -->
Diffstat (limited to 'etc')
-rw-r--r-- | etc/ci/Dockerfile | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/etc/ci/Dockerfile b/etc/ci/Dockerfile deleted file mode 100644 index beddf0f0f0b..00000000000 --- a/etc/ci/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM ubuntu:vivid - -# Required by mozjs to build -ENV SHELL /bin/sh - -# Enable 'universe' since it is not enabled by default -RUN echo "deb http://archive.ubuntu.com/ubuntu vivid main universe" > /etc/apt/sources.list -RUN echo "deb http://archive.ubuntu.com/ubuntu vivid-updates main universe" >> /etc/apt/sources.list - -# Install dependencies -RUN apt-get -y update -RUN apt-get install -y \ - cmake \ - curl \ - freeglut3-dev \ - g++ \ - git \ - gperf \ - libbz2-dev \ - libfreetype6-dev \ - libgl1-mesa-dri \ - libglib2.0-dev \ - libglu1-mesa-dev \ - libosmesa6-dev \ - libssl-dev \ - libxmu-dev \ - libxmu6 \ - python-virtualenv \ - xorg-dev - -# Servo will be built in /build -RUN mkdir /build -WORKDIR /build |