Skip to content

Commit

Permalink
Auto merge of #4791 - lzutao:osx2bors, r=matthiaskrgr
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Nov 8, 2019
2 parents 692b260 + 80effca commit f3a207e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ matrix:
fast_finish: true
include:
# Builds that are executed for every PR
- os: osx # run base tests on both platforms
- os: linux
- os: windows
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
Expand All @@ -56,6 +55,8 @@ matrix:
# We don't want to run these always because they go towards
# the build limit within the Travis rust-lang account.
# The jobs are approximately sorted by execution time
- os: osx
if: branch IN (auto, try)
- env: INTEGRATION=rust-lang/rls
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/cargo
Expand Down

0 comments on commit f3a207e

Please sign in to comment.