Skip to content

Commit cadf7d7

Browse files
committed
Auto merge of #3731 - phansch:travis, r=<try>
Travis: Don't run integration tests on every PR commit This does not save Clippy any time but it makes sure that the concurrent build limit is not reached as quickly for the `rust-lang` Travis account. I can't create a permalink to the discussion somehow, so here's an excerpt from the Infra channel: ``` [11:57 PM] pietroalbini: there is a clippy build (20 jobs) and a packed_simd one (42 builders) and a rustc one which isn't scheduling atm [11:58 PM] pietroalbini: I don't think there is a way to prioritize rustc builds in the queue on travis, right? [12:22 AM] alexcrichton: pietro: I don't think so no [12:22 AM] alexcrichton: If it's a problem we should cull builds on other projects [12:22 AM] alexcrichton: The rust repo is the #1 priority ``` Since the integration tests are rarely failing these days, I think it's fine to not run them on every commit. If needed, it's also still possible to do a `try` build with `@bors try`.
2 parents 84dca9a + 4e39e65 commit cadf7d7

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

.travis.yml

+22-14
Original file line numberDiff line numberDiff line change
@@ -39,40 +39,48 @@ install:
3939
matrix:
4040
fast_finish: true
4141
include:
42+
# Builds that are executed for every PR
4243
- os: osx # run base tests on both platforms
4344
env: BASE_TESTS=true
45+
if: type = pull_request OR branch IN (auto, try)
4446
- os: linux
4547
env: BASE_TESTS=true
48+
if: type = pull_request OR branch IN (auto, try)
4649
- os: windows
4750
env: CARGO_INCREMENTAL=0 BASE_TESTS=true
51+
if: type = pull_request OR branch IN (auto, try)
52+
53+
# Builds that are only executed when a PR is r+ed or a try build is started
54+
# We don't want to run these always because they go towards
55+
# the build limit within the Travis rust-lang account.
4856
- env: INTEGRATION=rust-lang/cargo
49-
if: repo =~ /^rust-lang\/rust-clippy$/
57+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
5058
- env: INTEGRATION=rust-random/rand
51-
if: repo =~ /^rust-lang\/rust-clippy$/
59+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
5260
- env: INTEGRATION=rust-lang-nursery/stdsimd
53-
if: repo =~ /^rust-lang\/rust-clippy$/
61+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
5462
- env: INTEGRATION=rust-lang/rustfmt
55-
if: repo =~ /^rust-lang\/rust-clippy$/
63+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
5664
- env: INTEGRATION=rust-lang-nursery/futures-rs
57-
if: repo =~ /^rust-lang\/rust-clippy$/
65+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
5866
- env: INTEGRATION=rust-lang-nursery/failure
59-
if: repo =~ /^rust-lang\/rust-clippy$/
67+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6068
- env: INTEGRATION=rust-lang-nursery/log
61-
if: repo =~ /^rust-lang\/rust-clippy$/
69+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6270
- env: INTEGRATION=rust-lang-nursery/chalk
63-
if: repo =~ /^rust-lang\/rust-clippy$/
71+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6472
- env: INTEGRATION=rust-lang/rls
65-
if: repo =~ /^rust-lang\/rust-clippy$/
73+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6674
- env: INTEGRATION=chronotope/chrono
67-
if: repo =~ /^rust-lang\/rust-clippy$/
75+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6876
- env: INTEGRATION=serde-rs/serde
69-
if: repo =~ /^rust-lang\/rust-clippy$/
77+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7078
- env: INTEGRATION=Geal/nom
71-
if: repo =~ /^rust-lang\/rust-clippy$/
79+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7280
- env: INTEGRATION=hyperium/hyper
73-
if: repo =~ /^rust-lang\/rust-clippy$/
81+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7482
- env: INTEGRATION=bluss/rust-itertools
75-
if: repo =~ /^rust-lang\/rust-clippy$/
83+
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7684
allow_failures:
7785
- os: windows
7886
env: CARGO_INCREMENTAL=0 BASE_TESTS=true

0 commit comments

Comments
 (0)