Skip to content

Commit f3a207e

Browse files
committed
Auto merge of #4791 - lzutao:osx2bors, r=matthiaskrgr
build macOS on bors branches only Clippy is portable enough. It is rare to see Clippy builds' broke on *nix OSes. Testing macOS build on auto and try branch is enough. changelog: none
2 parents 692b260 + 80effca commit f3a207e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ matrix:
4747
fast_finish: true
4848
include:
4949
# Builds that are executed for every PR
50-
- os: osx # run base tests on both platforms
5150
- os: linux
5251
- os: windows
5352
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
@@ -56,6 +55,8 @@ matrix:
5655
# We don't want to run these always because they go towards
5756
# the build limit within the Travis rust-lang account.
5857
# The jobs are approximately sorted by execution time
58+
- os: osx
59+
if: branch IN (auto, try)
5960
- env: INTEGRATION=rust-lang/rls
6061
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
6162
- env: INTEGRATION=rust-lang/cargo

0 commit comments

Comments
 (0)