Update CI config

This commit is contained in:
Jonas Platte 2020-04-24 21:53:42 +02:00
parent 16acf7f753
commit 053d2e94f6
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
5 changed files with 10 additions and 53 deletions

View File

@ -21,10 +21,7 @@ tasks:
cargo clippy --all-targets --all-features -- -D warnings cargo clippy --all-targets --all-features -- -D warnings
clippy_exit=$? clippy_exit=$?
cargo test --no-default-features --verbose
test1_exit=$?
cargo test --all-features --verbose 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 ))

View File

@ -11,16 +11,4 @@ tasks:
- test: | - test: |
cd ruma-serde cd ruma-serde
# We don't want the build to stop on individual failure of independent cargo build --verbose
# 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 ))

View File

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

View File

@ -1,29 +0,0 @@
language: "rust"
cache: "cargo"
rust:
- 1.36.0
- stable
- beta
- nightly
jobs:
allow_failures:
- rust: nightly
fast_finish: true
before_script:
- rustup component add rustfmt
- |
if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ]; then
rustup component add clippy
fi
- cargo generate-lockfile
script:
- cargo fmt -- --check
- |
if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ]; then
cargo clippy --all-targets --all-features -- -D warnings
fi
- cargo build --verbose
- cargo test --no-default-features --verbose
- cargo test --all-features --verbose
if: "type != push OR (tag IS blank AND branch = master)"

View File

@ -6,3 +6,7 @@ Part of that is a fork of serde_urlencoded, with support for sequences in `Deser
`Serialize` structs (e.g. `Vec<Something>`) that are (de)serialized as `field=val1&field=val2` `Serialize` structs (e.g. `Vec<Something>`) that are (de)serialized as `field=val1&field=val2`
(instead of the more common `field[]=val1&field[]=val2` format supported by other crates like (instead of the more common `field[]=val1&field[]=val2` format supported by other crates like
`serde_qs`). `serde_qs`).
## Minimum Rust version
ruma-serde requires Rust 1.36.0 or later.