Simplify CI scripts

This commit is contained in:
Jonas Platte 2020-04-24 21:40:06 +02:00
parent 0efac871bc
commit e24826cea5
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 6 additions and 22 deletions

View File

@ -21,10 +21,7 @@ tasks:
cargo clippy --all-targets --all-features -- -D warnings
clippy_exit=$?
cargo test --no-default-features --verbose
test1_exit=$?
cargo test --verbose
test_exit=$?
cargo test --all-features --verbose
test2_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))
exit $(( $fmt_exit || $clippy_exit || $test_exit ))

View File

@ -11,16 +11,6 @@ tasks:
- test: |
cd ruma-api
# We don't want the build to stop on individual failure of independent
# tools, so capture tool exit codes and set the task exit code manually
set +e
# Only make sure the code builds with the MSRV. Tests can require later
# Rust versions, don't compile or run them.
cargo build --no-default-features --verbose
build1_exit=$?
cargo build --all-features --verbose
build2_exit=$?
exit $(( $build1_exit || $build2_exit ))
cargo build --verbose

View File

@ -21,12 +21,9 @@ tasks:
cargo clippy --all-targets --all-features -- -D warnings
clippy_exit=$?
cargo test --no-default-features --verbose
test1_exit=$?
cargo test --all-features --verbose
test2_exit=$?
test_exit=$?
exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))
exit $(( $fmt_exit || $clippy_exit || $test_exit ))
# TODO: Add audit task once cargo-audit binary releases are available.
# See https://github.com/RustSec/cargo-audit/issues/66