Added `move` keyword and renamed `fail` to `panic`

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e124ca571def601491818bd95b6a691c22843032..261990052988f65a8fae1d0606015c48fcbb13d9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +1,23 @@
 # Use something that's not 'ruby' so we don't set up things like
-# RVM/bundler/ruby and whatnot. Right now 'rust' isn't a language on travis and
-# it treats unknown languages as ruby-like I believe.
+# RVM/bundler/ruby and whatnot. Right now 'rust' as a language actually
+# downloads a rust/cargo snapshot, which we don't really want for building rust.
 language: c
 
-# Before we start doing anything, install a stock LLVM
-install:
-  - sudo apt-get install llvm-3.3 llvm-3.3-dev clang-3.3 lldb-3.3
-
-# All of the llvm tools are suffixed with "-3.3" which we don't want, so symlink
-# them all into a local directory and just use that
+# The test suite is in general way too stressful for travis, especially in
+# terms of time limit and reliability. In the past we've tried to scale things
+# back to only build the stage1 compiler and run a subset of tests, but this
+# didn't end up panning out very well.
 #
-# FIXME: this shouldn't update the src/llvm sub-repo, that takes about a minute
-#        it's gotta download so much stuff.
+# As a result, we're just using travis to run `make tidy` now. It'll help
+# everyone find out about their trailing spaces early on!
 before_script:
-  - mkdir -p local-llvm/bin
-  - ln -nsf /usr/bin/llvm-config-3.3 local-llvm/bin/llvm-config
-  - ln -nsf /usr/bin/llvm-mc-3.3 local-llvm/bin/llvm-mc
-  - ln -nsf /usr/bin/llvm-as-3.3 local-llvm/bin/llvm-as
-  - ln -nsf /usr/bin/llvm-dis-3.3 local-llvm/bin/llvm-dis
-  - ln -nsf /usr/bin/llc-3.3 local-llvm/bin/llc
-  - ln -nsf /usr/include/llvm-3.3 local-llvm/include
-  - ./configure --disable-optimize-tests --llvm-root=`pwd`/local-llvm --enable-fast-make --enable-clang
-
-# Tidy everything up first, then build a few things, and then run a few tests.
-# Note that this is meant to run in a "fairly small" amount of time, so this
-# isn't exhaustive at all.
-#
-# As a result of https://github.com/travis-ci/travis-ci/issues/1066, we run
-# everything in one large command instead of multiple commands.
-script: |
-  make tidy &&
-  make -j4 rustc-stage1 &&
-  make check-stage1-std check-stage1-rpass check-stage1-cfail check-stage1-rfail
+  - ./configure --llvm-root=path/to/nowhere
+script:
+  - make tidy
 
-env:
-  - NO_BENCH=1
+notifications:
+  email: false
 
-# We track this ourselves, and in theory we don't have to update the LLVM repo
-# (but sadly we do right now anyway).
-git:
-  submodules: false
+branches:
+  only:
+    - master