Auto merge of #30176 - brson:no-more-authors, r=steveklabnik

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 03e38f4e0c1ac03ac0bf020f4292bb22132b2de5..cc93b1127c3a73069dd5d6a7053ee741f9781984 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,27 @@
-# Use something that's not 'ruby' so we don't set up things like
-# 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
-sudo: false
+language: generic
+sudo: required
+dist: trusty
+
+# LLVM takes awhile to check out and otherwise we'll manage the submodules in
+# our configure script, so disable auto submodule management.
+git:
+  submodules: false
+
+before_install:
+  - 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
 
-# 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.
-#
-# 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:
-  - ./configure --llvm-root=path/to/nowhere
 script:
-  - make tidy
+  - ./configure --llvm-root=/usr/lib/llvm-3.7
+  - make tidy && make check-notidy -j4
+
+# Real testing happens on http://buildbot.rust-lang.org/
+#
+# See https://github.com/rust-lang/rust-buildbot
+#     CONTRIBUTING.md#pull-requests
 
 notifications:
   email: false