From cd4e593c96d8e9add2a4d7b18d96b46cbf9395eb Mon Sep 17 00:00:00 2001
From: flip1995 <hello@philkrones.com>
Date: Mon, 1 Jul 2019 15:56:06 +0200
Subject: [PATCH] Reenable cargo and rls tests in travis
---
.travis.yml | 9 ++++-----
1 file 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