diff options
| author | bors <bors@rust-lang.org> | 2019-11-08 23:33:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-08 23:33:30 +0000 |
| commit | f3a207e63bc9d305c8c908fafb1f34565efc1426 (patch) | |
| tree | 795e27b2493362577faed3f675a39934520f3cae | |
| parent | 692b260c346a58949ec0acf80d550d8764a6f532 (diff) | |
| parent | 80effca124279a205baec20cd5a427ac98698cbf (diff) | |
| download | rust-f3a207e63bc9d305c8c908fafb1f34565efc1426.tar.gz rust-f3a207e63bc9d305c8c908fafb1f34565efc1426.zip | |
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
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b07ebe501c7..03cd66749d5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 |