diff options
| author | bors <bors@rust-lang.org> | 2015-10-20 22:00:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-20 22:00:56 +0000 |
| commit | d8acb03cd553ea4d5613488b67333a53d8bb583c (patch) | |
| tree | 0a3763024b63335cc2e8c11a6fbe0f7af378aa78 | |
| parent | 97ba52ec379e17cc0984224b756282b68bc3a53b (diff) | |
| parent | 1181ca4b515cc7bb68ab62f99999d06c0e6f763a (diff) | |
| download | rust-d8acb03cd553ea4d5613488b67333a53d8bb583c.tar.gz rust-d8acb03cd553ea4d5613488b67333a53d8bb583c.zip | |
Auto merge of #29159 - arcnmx:travis-trusty, r=alexcrichton
Moves back away from docker but still uses the GCE infrastructure with a system-installed LLVM. See http://docs.travis-ci.com/user/trusty-ci-environment/
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | src/etc/Dockerfile | 12 |
2 files changed, 10 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index 944709491c3..cc93b1127c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ -language: c +language: generic sudo: required -services: - - docker +dist: trusty # LLVM takes awhile to check out and otherwise we'll manage the submodules in # our configure script, so disable auto submodule management. @@ -9,14 +8,15 @@ git: submodules: false before_install: - - docker build -t rust -f src/etc/Dockerfile src/etc + - echo 0 | sudo tee /proc/sys/net/ipv6/conf/lo/disable_ipv6 + - echo 'deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list + - echo 'deb-src http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list + - sudo apt-get update + - sudo apt-get --force-yes install curl make g++ python2.7 git zlib1g-dev libedit-dev llvm-3.7-tools + script: - - docker run --privileged -tv `pwd`:/build rust - sh -c " - ./configure --llvm-root=/usr/lib/llvm-3.7 && - make tidy && - make check -j4 - " + - ./configure --llvm-root=/usr/lib/llvm-3.7 + - make tidy && make check-notidy -j4 # Real testing happens on http://buildbot.rust-lang.org/ # diff --git a/src/etc/Dockerfile b/src/etc/Dockerfile deleted file mode 100644 index 69c5e151f18..00000000000 --- a/src/etc/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:latest - -RUN echo 'deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | \ - sudo tee -a /etc/apt/sources.list -RUN echo 'deb-src http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | \ - sudo tee -a /etc/apt/sources.list -RUN apt-get update -RUN apt-get -y install curl make g++ python2.7 git zlib1g-dev libedit-dev -RUN apt-get -y --force-yes install llvm-3.7-tools - -RUN mkdir /build -WORKDIR /build |