Auto merge of #4198 - matthiaskrgr:rustup_8, r=flip1995

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4ca18a93ea86e56fe3aeec5f0736bbf37f225587..00636525c5bdeb454897a31abbb7e515528f47b8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,12 +51,13 @@ matrix:
     # We don't want to run these always because they go towards
     # the build limit within the Travis rust-lang account.
     # The jobs are approximately sorted by execution time
-    - env: INTEGRATION=rust-lang/cargo
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
+    # disabled cargo and rls integration test due to https://github.com/rust-lang/rust-clippy/issues/4121
+    #- env: INTEGRATION=rust-lang/cargo
+    #  if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang-nursery/chalk
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rls
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
+    #- env: INTEGRATION=rust-lang/rls
+    #  if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=Geal/nom
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang/rustfmt