Skip to content

Commit

Permalink
Auto merge of #230 - Atul9:add-cargo-fmt-to-travis-config, r=mbrubeck
Browse files Browse the repository at this point in the history
Add cargo fmt to travis build config

The build failure is fixed in this PR #231 hence #231 should be merged first.
  • Loading branch information
bors-servo committed Jul 13, 2020
2 parents f7c7157 + b3fada1 commit f7e01ef
Showing 1 changed file with 23 additions and 16 deletions.
39 changes: 23 additions & 16 deletions .travis.yml
Expand Up @@ -19,19 +19,26 @@ matrix:
env: DO_FUZZ=true
- rust: stable
env: DO_FUZZ=true
script: |
cargo build --verbose &&
cargo test --verbose &&
cargo test --verbose --features serde &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench) &&
([ $TRAVIS_RUST_VERSION != nightly ] || bash ./scripts/run_miri.sh) &&
if [ "$DO_FUZZ" = true ]
then
(
cd fuzz
./travis-fuzz.sh
)
fi
script:
- |
if [[ "$TRAVIS_RUST_VERSION" == stable ]]
then
rustup component add rustfmt
cargo fmt --all -- --check
fi
- |
cargo build --verbose &&
cargo test --verbose &&
cargo test --verbose --features serde &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo check --verbose --no-default-features) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --features union) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo test --verbose --all-features) &&
([ $TRAVIS_RUST_VERSION != nightly ] || cargo bench --verbose bench) &&
([ $TRAVIS_RUST_VERSION != nightly ] || bash ./scripts/run_miri.sh) &&
if [ "$DO_FUZZ" = true ]
then
(
cd fuzz
./travis-fuzz.sh
)
fi

0 comments on commit f7e01ef

Please sign in to comment.