diff --git a/.travis.yml b/.travis.yml index 53af848a86d7..046b30f54da5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,6 @@ dist: xenial language: bash -os: - - linux - - osx - - windows - branches: # Don't build these branches except: @@ -51,14 +46,6 @@ install: matrix: fast_finish: true include: - # Builds that are executed for every PR - - os: osx # run base tests on both platforms - env: BASE_TESTS=true - - os: linux - env: BASE_TESTS=true - - os: windows - env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true - # Builds that are only executed when a PR is r+ed or a try build is started # We don't want to run these always because they go towards # the build limit within the Travis rust-lang account. @@ -84,23 +71,14 @@ matrix: - env: INTEGRATION=rust-random/rand if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/futures-rs - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=Marwes/combine - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/failure - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/log - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=chronotope/chrono if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) allow_failures: - os: windows env: CARGO_INCREMENTAL=0 BASE_TESTS=true OS_WINDOWS=true - # prevent these jobs with default env vars - exclude: - - os: linux - - os: osx - - os: windows before_script: - | diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 6ba9a284c504..753afec9de7d 100755 --- a/ci/integration-tests.sh +++ b/ci/integration-tests.sh @@ -5,13 +5,17 @@ if [[ -z "$INTEGRATION" ]]; then exit 0 fi +CARGO_TARGET_DIR=$(pwd)/target +export CARGO_TARGET_DIR + rm ~/.cargo/bin/cargo-clippy cargo install --force --debug --path . echo "Running integration test for crate ${INTEGRATION}" -git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout -cd checkout || exit 1 +mkdir -p "checkout/$INTEGRATION" +curl -sSL "https://github.com/$INTEGRATION/archive/master.tar.gz" | tar -xzf - -C "checkout/$INTEGRATION" +cd "checkout/$INTEGRATION" || exit 1 # run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage RUST_BACKTRACE=full \