X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=.travis.yml;h=d456497d99722bc8347c29bb331314d26040bc1e;hb=c325137d086e76bbe658ad9ebe44979743b03264;hp=d3f8c116607b9b4e883fc240ef65d069be6c18a1;hpb=6ce5edcdd5f520f647e19a8376d797566dec686a;p=rust.git

diff --git a/.travis.yml b/.travis.yml
index d3f8c116607..d456497d997 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,6 @@ os:
   - osx
   - windows
 
-sudo: false
-
 branches:
   # Don't build these branches
   except:
@@ -20,18 +18,10 @@ env:
  global:
    - RUST_BACKTRACE=1
 
-before_install:
- - |
-    # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307
-    # might not be necessary in the future
-    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-     command curl -sSL https://rvm.io/mpapis.asc | gpg --import -
-     rvm get stable
-    fi
-
 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,31 +33,49 @@ 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
-    - env: INTEGRATION=rust-lang-nursery/rand
+      if: repo =~ /^rust-lang\/rust-clippy$/
+    - env: INTEGRATION=rust-random/rand
+      if: repo =~ /^rust-lang\/rust-clippy$/
     - env: INTEGRATION=rust-lang-nursery/stdsimd
-    - env: INTEGRATION=rust-lang-nursery/rustfmt
+      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
-    - env: INTEGRATION=rust-lang-nursery/rls
+      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
-# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
-#    - env: INTEGRATION=hyperium/hyper
+      if: repo =~ /^rust-lang\/rust-clippy$/
+    - env: INTEGRATION=hyperium/hyper
+      if: repo =~ /^rust-lang\/rust-clippy$/
+    - env: INTEGRATION=bluss/rust-itertools
+      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
@@ -75,14 +83,13 @@ matrix:
     - os: windows
 
 script:
-  # uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
-  # - |
-  #     rm rust-toolchain
-  #     cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
-  #     RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
-  #     travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
-  #     rustup default master
-  #     export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
+  - |
+      rm rust-toolchain
+      cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
+      RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
+      travis_retry rustup-toolchain-install-master -f -n master $RUSTC_HASH
+      rustup default master
+      export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
   - |
     if [ -z ${INTEGRATION} ]; then
       ./ci/base-tests.sh && sleep 5