Merge pull request #3113 from mikerite/fix-3112

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c2891ed9220dced7ce12e37cb1cb84a8ae24a123..c6bd67ae0f3df6ffed8283d7a9f74fa0236f3cbf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,10 +24,13 @@ 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:
@@ -45,20 +48,6 @@ matrix:
     - env: INTEGRATION=serde-rs/serde
     - env: INTEGRATION=Geal/nom
     - env: INTEGRATION=hyperium/hyper
-  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:
   - |
@@ -72,7 +61,11 @@ after_success: |
   #!/bin/bash
   if [ $(uname) == Linux ]; then
     set -ex
-    ./.github/deploy.sh
+    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" ] &&