Skip to content

Commit ae944a2

Browse files
committed
Auto merge of #4720 - lzutao:int-errexit, r=phansch
Do not early exit if cargo clippy returns non-zero status code changelog: none
2 parents 66df92a + 07119d3 commit ae944a2

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ cache:
1212
directories:
1313
- $HOME/.cargo
1414
before_cache:
15+
- strip -s $HOME/.cargo/bin/*
1516
- cargo install -Z install-upgrade cargo-cache --debug
1617
- cargo cache --autoclean
1718

ci/integration-tests.sh

+10-5
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,21 @@ 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
25+
-- \
26+
--cap-lints warn \
27+
-W clippy::pedantic \
28+
-W clippy::nursery \
29+
> clippy_output 2>&1 || true
30+
31+
cat clippy_output
2732

2833
if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
2934
exit 1

0 commit comments

Comments
 (0)