mirror of
https://github.com/rust-lang/rust-clippy
synced 2024-12-04 02:20:04 +00:00
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
This commit is contained in:
commit
f3a207e63b
1 changed files with 2 additions and 1 deletions
|
@ -47,7 +47,6 @@ matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
# Builds that are executed for every PR
|
# Builds that are executed for every PR
|
||||||
- os: osx # run base tests on both platforms
|
|
||||||
- os: linux
|
- os: linux
|
||||||
- os: windows
|
- os: windows
|
||||||
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
|
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
|
||||||
|
@ -56,6 +55,8 @@ matrix:
|
||||||
# We don't want to run these always because they go towards
|
# We don't want to run these always because they go towards
|
||||||
# the build limit within the Travis rust-lang account.
|
# the build limit within the Travis rust-lang account.
|
||||||
# The jobs are approximately sorted by execution time
|
# The jobs are approximately sorted by execution time
|
||||||
|
- os: osx
|
||||||
|
if: branch IN (auto, try)
|
||||||
- env: INTEGRATION=rust-lang/rls
|
- env: INTEGRATION=rust-lang/rls
|
||||||
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
|
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
|
||||||
- env: INTEGRATION=rust-lang/cargo
|
- env: INTEGRATION=rust-lang/cargo
|
||||||
|
|
Loading…
Reference in a new issue