Skip to content

Commit 18ad60c

Browse files
committed
Auto merge of #4720 - lzutao:int-errexit, r=<try>
Do not early exit if cargo clippy returns non-zero status code changelog: none
2 parents b3ecd48 + b8c8b3d commit 18ad60c

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

.travis.yml

+4-8
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ matrix:
4646
fast_finish: true
4747
include:
4848
# Builds that are executed for every PR
49-
- os: osx # run base tests on both platforms
5049
- os: linux
51-
- os: windows
52-
env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
53-
5450
# Builds that are only executed when a PR is r+ed or a try build is started
5551
# We don't want to run these always because they go towards
5652
# the build limit within the Travis rust-lang account.
@@ -70,13 +66,13 @@ matrix:
7066
- env: INTEGRATION=bluss/rust-itertools
7167
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
7268
- env: INTEGRATION=serde-rs/serde
73-
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
69+
if: repo =~ /^rust-lang\/rust-clippy$/
7470
- env: INTEGRATION=rust-lang-nursery/stdsimd
75-
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
71+
if: repo =~ /^rust-lang\/rust-clippy$/
7672
- env: INTEGRATION=rust-random/rand
77-
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
73+
if: repo =~ /^rust-lang\/rust-clippy$/
7874
- env: INTEGRATION=rust-lang-nursery/futures-rs
79-
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
75+
if: repo =~ /^rust-lang\/rust-clippy$/
8076
- env: INTEGRATION=Marwes/combine
8177
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
8278
- env: INTEGRATION=rust-lang-nursery/failure

ci/integration-tests.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,15 @@ cargo install --force --debug --path .
1414
echo "Running integration test for crate ${INTEGRATION}"
1515

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

19-
# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
19+
# run clippy on a project, try to be verbose and trigger as many warnings
20+
# as possible for greater coverage
2021
RUST_BACKTRACE=full \
2122
cargo clippy \
2223
--all-targets \
2324
--all-features \
24-
-- --cap-lints warn -W clippy::pedantic -W clippy::nursery \
25-
2>& 1 \
26-
| tee clippy_output
27-
28-
if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
29-
exit 1
30-
fi
25+
-- \
26+
--cap-lints warn \
27+
-W clippy::pedantic \
28+
-W clippy::nursery

0 commit comments

Comments
 (0)