Fix `needless_continue` false positive

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 3780f6ece79829840eed4d6aecff42bb8c8e4ea1..acb5b9ae0d2429e8d7f48acfbe5422bfc82538e9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,13 +42,10 @@ matrix:
     # Builds that are executed for every PR
     - os: osx # run base tests on both platforms
       env: BASE_TESTS=true
-      if: type = pull_request OR branch IN (auto, try)
     - os: linux
       env: BASE_TESTS=true
-      if: type = pull_request OR branch IN (auto, try)
     - os: windows
       env: CARGO_INCREMENTAL=0 BASE_TESTS=true
-      if: type = pull_request OR branch IN (auto, try)
 
     # Builds that are only executed when a PR is r+ed or a try build is started
     # We don't want to run these always because they go towards
@@ -93,10 +90,7 @@ matrix:
 script:
   - |
       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
+      ./setup-toolchain.sh
       export LD_LIBRARY_PATH=$(rustc --print sysroot)/lib
   - |
     if [ -z ${INTEGRATION} ]; then