Skip to content

Commit

Permalink
Auto merge of #4720 - lzutao:int-errexit, r=<try>
Browse files Browse the repository at this point in the history
Do not early exit if cargo clippy returns non-zero status code

changelog: none
  • Loading branch information
bors committed Oct 26, 2019
2 parents b3ecd48 + b8c8b3d commit 18ad60c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
12 changes: 4 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ 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

# Builds that are only executed when a PR is r+ed or a try build is started
# We don't want to run these always because they go towards
# the build limit within the Travis rust-lang account.
Expand All @@ -70,13 +66,13 @@ matrix:
- env: INTEGRATION=bluss/rust-itertools
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=serde-rs/serde
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
if: repo =~ /^rust-lang\/rust-clippy$/
- env: INTEGRATION=rust-lang-nursery/stdsimd
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
if: repo =~ /^rust-lang\/rust-clippy$/
- env: INTEGRATION=rust-random/rand
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
if: repo =~ /^rust-lang\/rust-clippy$/
- env: INTEGRATION=rust-lang-nursery/futures-rs
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
if: repo =~ /^rust-lang\/rust-clippy$/
- env: INTEGRATION=Marwes/combine
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang-nursery/failure
Expand Down
16 changes: 7 additions & 9 deletions ci/integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,15 @@ cargo install --force --debug --path .
echo "Running integration test for crate ${INTEGRATION}"

git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout
cd checkout || exit 1
cd checkout

# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
# run clippy on a project, try to be verbose and trigger as many warnings
# as possible for greater coverage
RUST_BACKTRACE=full \
cargo clippy \
--all-targets \
--all-features \
-- --cap-lints warn -W clippy::pedantic -W clippy::nursery \
2>& 1 \
| tee clippy_output

if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
exit 1
fi
-- \
--cap-lints warn \
-W clippy::pedantic \
-W clippy::nursery

0 comments on commit 18ad60c

Please sign in to comment.