diff --git a/.builds/beta.yml b/.builds/beta.yml index 9179b87a..e81bd85b 100644 --- a/.builds/beta.yml +++ b/.builds/beta.yml @@ -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 --all-features --verbose - test2_exit=$? + test_exit=$? - exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit )) + exit $(( $fmt_exit || $clippy_exit || $test_exit )) diff --git a/.builds/msrv.yml b/.builds/msrv.yml index 200c20ef..a6ea11f0 100644 --- a/.builds/msrv.yml +++ b/.builds/msrv.yml @@ -11,16 +11,4 @@ tasks: - test: | cd ruma-serde - # 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 diff --git a/.builds/stable.yml b/.builds/stable.yml index ea1cd2b3..0424b9f5 100644 --- a/.builds/stable.yml +++ b/.builds/stable.yml @@ -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 --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 )) # TODO: Add audit task once cargo-audit binary releases are available. # See https://github.com/RustSec/cargo-audit/issues/66 diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4a0863c2..00000000 --- a/.travis.yml +++ /dev/null @@ -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)" diff --git a/README.md b/README.md index 7102b30a..5288aa54 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ Part of that is a fork of serde_urlencoded, with support for sequences in `Deser `Serialize` structs (e.g. `Vec`) that are (de)serialized as `field=val1&field=val2` (instead of the more common `field[]=val1&field[]=val2` format supported by other crates like `serde_qs`). + +## Minimum Rust version + +ruma-serde requires Rust 1.36.0 or later.