Replace another occurrence of "".to_owned()

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 60f1b6961c736837297fa410eee275b3362cc146..8d76e10983eeaf3d96e7f1f91a00340878a687b6 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,21 +24,39 @@ before_install:
     fi
 
 install:
-  - . $HOME/.nvm/nvm.sh
-  - nvm install stable
-  - nvm use stable
-  - npm install remark-cli remark-lint
+  - |
+    if [ -z ${INTEGRATION} ]; then
+      . $HOME/.nvm/nvm.sh
+      nvm install stable
+      nvm use stable
+      npm install remark-cli remark-lint
+    fi
 
 matrix:
   include:
     - env: BASE_TESTS=true # runs the base tests
     - env: INTEGRATION=rust-lang/cargo
     - env: INTEGRATION=rust-lang-nursery/rand
-  allow_failures:
-    - env: INTEGRATION=rust-lang/cargo
-    - env: INTEGRATION=rust-lang-nursery/rand
+    - env: INTEGRATION=rust-lang-nursery/stdsimd
+    - env: INTEGRATION=rust-lang-nursery/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=chronotope/chrono
+    - env: INTEGRATION=serde-rs/serde
+    - env: INTEGRATION=Geal/nom
+    - env: INTEGRATION=hyperium/hyper
 
 script:
+  - |
+      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
   - |
     if [ -z ${INTEGRATION} ]; then
       ./ci/base-tests.sh
@@ -49,8 +67,12 @@ script:
 after_success: |
   #!/bin/bash
   if [ $(uname) == Linux ]; then
-    set -e
-    ./.github/deploy.sh
+    set -ex
+    if [ -z ${INTEGRATION} ]; then
+      ./.github/deploy.sh
+    else
+      echo "Not deploying, because we're in an integration test run"
+    fi
     # trigger rebuild of the clippy-service, to keep it up to date with clippy itself
     if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
        [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] &&