Auto merge of #3524 - phansch:update_contributing, r=phansch

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index af209ca96d0ef3c6e5216ca45fbfa4f8d991f493..5014a66a79c36a725405d8b75cecbd961fe39e6b 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ os:
   - osx
   - windows
 
-sudo: false
-
 branches:
   # Don't build these branches
   except:
@@ -32,6 +30,7 @@ before_install:
 install:
   - |
     if [ -z ${INTEGRATION} ]; then
+      rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable
@@ -43,30 +42,47 @@ install:
       fi
     fi
 
+# disabling the integration tests in forks should be done with
+# if: fork = false
+# but this is currently buggy travis-ci/travis-ci#9118
 matrix:
+  fast_finish: true
   include:
     - os: osx # run base tests on both platforms
       env: BASE_TESTS=true
     - os: linux
       env: BASE_TESTS=true
     - os: windows
-      env: BASE_TEST=true
+      env: CARGO_INCREMENTAL=0 BASE_TESTS=true
     - env: INTEGRATION=rust-lang/cargo
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-random/rand
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/stdsimd
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang/rustfmt
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/futures-rs
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/failure
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/log
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/chalk
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang/rls
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=chronotope/chrono
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=serde-rs/serde
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=Geal/nom
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=hyperium/hyper
+      if: repo =~ /^rust-lang\/rust-clippy$/
   allow_failures:
   - os: windows
-    env: BASE_TEST=true
+    env: CARGO_INCREMENTAL=0 BASE_TESTS=true
 # prevent these jobs with default env vars
   exclude:
     - os: linux