diff --git a/.travis.yml b/.travis.yml index 8d837ac1e1e8..4a229c4734ae 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. @@ -78,29 +65,21 @@ matrix: - env: INTEGRATION=bluss/rust-itertools if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=serde-rs/serde MANIFEST_PATH=serde/Cargo.toml - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-lang-nursery/stdsimd MANIFEST_PATH=crates/core_arch/Cargo.toml - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - env: INTEGRATION=rust-random/rand if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) - env: INTEGRATION=rust-lang-nursery/futures-rs MANIFEST_PATH=futures/Cargo.toml - if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try) + if: repo =~ /^rust-lang\/rust-clippy$/ - 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) + if: repo =~ /^rust-lang\/rust-clippy$/ - 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: - |