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

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d3f8c116607b9b4e883fc240ef65d069be6c18a1..af209ca96d0ef3c6e5216ca45fbfa4f8d991f493 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,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
@@ -75,14 +74,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