about summary refs log tree commit diff
diff options
context:
space:
mode:
authorflip1995 <hello@philkrones.com>2019-07-01 15:56:06 +0200
committerflip1995 <hello@philkrones.com>2019-07-01 15:56:06 +0200
commitcd4e593c96d8e9add2a4d7b18d96b46cbf9395eb (patch)
tree40dc5b6c6e40c13e4002ea0962ad9ac920383796
parentfb56e90e127854c72dcf0d51178b95c2a596a00f (diff)
downloadrust-cd4e593c96d8e9add2a4d7b18d96b46cbf9395eb.tar.gz
rust-cd4e593c96d8e9add2a4d7b18d96b46cbf9395eb.zip
Reenable cargo and rls tests in travis
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index bc3b116a509..ee990111af9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,13 +51,12 @@ 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
-    # 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/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