diff options
| author | bors <bors@rust-lang.org> | 2020-01-05 19:32:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-05 19:32:20 +0000 |
| commit | 390eacff80142b7314940921245585a57455e474 (patch) | |
| tree | ba5f758afbf46a6178a6d4af5d8050c73e878d7b | |
| parent | 732825dcff6d1f115225305ce5e0c9c9d876a0ff (diff) | |
| parent | fe919b423121009ed15b690070ed2041c8c7850f (diff) | |
| download | rust-390eacff80142b7314940921245585a57455e474.tar.gz rust-390eacff80142b7314940921245585a57455e474.zip | |
Auto merge of #4998 - JohnTitor:revive-rls, r=llogiq
Re-enable rls integration test It seems rls integration test passes correctly: https://travis-ci.com/rust-lang/rust-clippy/builds/143133541 changelog: none
| -rw-r--r-- | .travis.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 1afbf65a927..bbf084259ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ before_cache: - cargo cache --autoclean env: - global: - - RUST_BACKTRACE=1 - - secure: "OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s=" + global: + - RUST_BACKTRACE=1 + - secure: "OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s=" before_install: - export CARGO_TARGET_DIR="$TRAVIS_BUILD_DIR/target" @@ -104,8 +104,6 @@ matrix: allow_failures: - os: windows env: CARGO_INCREMENTAL=0 OS_WINDOWS=true - # FIXME: Remove this once rls gets rustup - - env: INTEGRATION=rust-lang/rls before_script: - | |