Skip to content

Commit 9ac804e

Browse files
committed
travis: Stop building and testing rust
Instead, only run `make tidy`. The tidy script can run quite quickly, and it's super annoying to run tests for 50 minutes only to have bors fail with a "trailing whitespace" error.
1 parent b2d4eb1 commit 9ac804e

File tree

1 file changed

+17
-47
lines changed

1 file changed

+17
-47
lines changed

.travis.yml

Lines changed: 17 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,34 @@
11
# Use something that's not 'ruby' so we don't set up things like
2-
# RVM/bundler/ruby and whatnot. Right now 'rust' isn't a language on travis and
3-
# it treats unknown languages as ruby-like I believe.
2+
# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
3+
# downloads a rust/cargo snapshot, which we don't really want for building rust.
44
language: c
55

6-
# Before we start doing anything, install a stock LLVM
6+
# Make sure we've got an up-to-date g++ compiler to get past the LLVM configure
7+
# script.
78
install:
8-
- sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise-3.4 main' >> /etc/apt/sources.list"
9-
- sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
10-
- sudo sh -c "echo 'deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu precise main' >> /etc/apt/sources.list"
11-
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
9+
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
1210
- sudo apt-get update -qq
13-
- sudo apt-get install -qq --force-yes -y llvm-$LLVM_VERSION
14-
llvm-${LLVM_VERSION}-dev clang-$LLVM_VERSION lldb-$LLVM_VERSION
11+
- sudo apt-get install g++-4.7
1512

16-
17-
# All of the llvm tools are suffixed with "-$VERS" which we don't want, so
18-
# symlink them all into a local directory and just use that
13+
# The test suite is in general way too stressful for travis, especially in
14+
# terms of time limit and reliability. In the past we've tried to scale things
15+
# back to only build the stage1 compiler and run a subset of tests, but this
16+
# didn't end up panning out very well.
1917
#
20-
# FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
21-
# it's gotta download so much stuff.
18+
# As a result, we're just using travis to run `make tidy` now. It'll help
19+
# everyone find out about their trailing spaces early on!
2220
before_script:
23-
- mkdir -p local-llvm/bin
24-
- ln -nsf /usr/bin/llvm-config-$LLVM_VERSION local-llvm/bin/llvm-config
25-
- ln -nsf /usr/bin/llvm-mc-$LLVM_VERSION local-llvm/bin/llvm-mc
26-
- ln -nsf /usr/bin/llvm-as-$LLVM_VERSION local-llvm/bin/llvm-as
27-
- ln -nsf /usr/bin/llvm-dis-$LLVM_VERSION local-llvm/bin/llvm-dis
28-
- ln -nsf /usr/bin/llc-$LLVM_VERSION local-llvm/bin/llc
29-
- ln -nsf /usr/include/llvm-$LLVM_VERSION local-llvm/include
30-
- ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm
31-
--enable-fast-make --enable-clang
21+
- ./configure --llvm-root=`pwd`/local-llvm
22+
script:
23+
- make tidy
3224

33-
# Tidy everything up first, then build a few things, and then run a few tests.
34-
# Note that this is meant to run in a "fairly small" amount of time, so this
35-
# isn't exhaustive at all.
36-
#
37-
# As a result of https://github.com/travis-ci/travis-ci/issues/1066, we run
38-
# everything in one large command instead of multiple commands.
39-
script: |
40-
if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then
41-
if [[ $LLVM_VERSION != '3.4' ]]; then exit 0; fi
42-
fi &&
43-
make tidy &&
44-
make -j4 rustc-stage1 RUSTFLAGS='-Z time-passes' &&
45-
make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail check-stage1-doc
25+
notifications:
26+
email: false
4627

4728
env:
4829
global:
49-
- NO_BENCH=1
50-
matrix:
51-
- LLVM_VERSION=3.3
5230
- LLVM_VERSION=3.4
5331

54-
# We track this ourselves, and in theory we don't have to update the LLVM repo
55-
# (but sadly we do right now anyway).
56-
git:
57-
submodules: false
58-
59-
notifications:
60-
email: false
61-
6232
branches:
6333
only:
6434
- master

0 commit comments

Comments
 (0)