Skip to content

Commit 1181ca4

Browse files
committed
Use Travis trusty infrastructure
1 parent d3f4978 commit 1181ca4

File tree

2 files changed

+10
-22
lines changed

2 files changed

+10
-22
lines changed

.travis.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
language: c
1+
language: generic
22
sudo: required
3-
services:
4-
- docker
3+
dist: trusty
54

65
# LLVM takes awhile to check out and otherwise we'll manage the submodules in
76
# our configure script, so disable auto submodule management.
87
git:
98
submodules: false
109

1110
before_install:
12-
- docker build -t rust -f src/etc/Dockerfile src/etc
11+
- echo 0 | sudo tee /proc/sys/net/ipv6/conf/lo/disable_ipv6
12+
- echo 'deb http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list
13+
- echo 'deb-src http://llvm.org/apt/trusty/ llvm-toolchain-trusty-3.7 main' | sudo tee -a /etc/apt/sources.list
14+
- sudo apt-get update
15+
- sudo apt-get --force-yes install curl make g++ python2.7 git zlib1g-dev libedit-dev llvm-3.7-tools
16+
1317
script:
14-
- docker run --privileged -tv `pwd`:/build rust
15-
sh -c "
16-
./configure --llvm-root=/usr/lib/llvm-3.7 &&
17-
make tidy &&
18-
make check -j4
19-
"
18+
- ./configure --llvm-root=/usr/lib/llvm-3.7
19+
- make tidy && make check-notidy -j4
2020

2121
# Real testing happens on http://buildbot.rust-lang.org/
2222
#

src/etc/Dockerfile

-12
This file was deleted.

0 commit comments

Comments
 (0)