rustup https://github.com/rust-lang/rust/pull/54071/

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 04027833e7af555006fd246d80e19279e4df587d..af209ca96d0ef3c6e5216ca45fbfa4f8d991f493 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,13 +10,11 @@ os:
 sudo: false
 
 branches:
-  only:
-    # This is where pull requests from "bors r+" are built.
-    - staging
-    # This is where pull requests from "bors try" are built.
-    - trying
-    # Also build pull requests.
-    - master
+  # Don't build these branches
+  except:
+    # Used by bors
+    - trying.tmp
+    - staging.tmp
 
 env:
  global:
@@ -54,19 +52,18 @@ matrix:
     - os: windows
       env: BASE_TEST=true
     - env: INTEGRATION=rust-lang/cargo
-    - env: INTEGRATION=rust-lang-nursery/rand
+    - env: INTEGRATION=rust-random/rand
     - env: INTEGRATION=rust-lang-nursery/stdsimd
-    - env: INTEGRATION=rust-lang-nursery/rustfmt
+    - env: INTEGRATION=rust-lang/rustfmt
     - env: INTEGRATION=rust-lang-nursery/futures-rs
     - env: INTEGRATION=rust-lang-nursery/failure
     - env: INTEGRATION=rust-lang-nursery/log
     - env: INTEGRATION=rust-lang-nursery/chalk
-    - env: INTEGRATION=rust-lang-nursery/rls
+    - env: INTEGRATION=rust-lang/rls
     - env: INTEGRATION=chronotope/chrono
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
-# uncomment once https://github.com/rust-lang/rust/issues/55376 is fixed
-#    - env: INTEGRATION=hyperium/hyper
+    - env: INTEGRATION=hyperium/hyper
   allow_failures:
   - os: windows
     env: BASE_TEST=true
@@ -79,7 +76,7 @@ matrix:
 script:
   - |
       rm rust-toolchain
-      cargo install rustup-toolchain-install-master || echo "rustup-toolchain-install-master already installed"
+      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