diff options
author | boastful-squirrel <boastful.squirrel@gmail.com> | 2019-05-03 05:28:31 +0000 |
---|---|---|
committer | boastful-squirrel <boastful.squirrel@gmail.com> | 2019-05-03 05:28:31 +0000 |
commit | 8f1793e02f0dadbab668b51850e14bd160b440d8 (patch) | |
tree | 4e125df23c71e092c3f83d0289554df980e0bb2e /.travis.yml | |
parent | Print error when parsing query parameters fail (diff) | |
parent | Merge pull request #99 from KSXGitHub/new-clippy (diff) | |
download | miniserve-8f1793e02f0dadbab668b51850e14bd160b440d8.tar.gz miniserve-8f1793e02f0dadbab668b51850e14bd160b440d8.zip |
Merge branch 'master' into themed-errors
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 42c4136..b436fb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: rust dist: xenial -rust: - - stable - - beta - - nightly +# According to https://docs.travis-ci.com/user/customizing-the-build#rows-that-are-allowed-to-fail, +# these empty arrays are actually required. +rust: [] +env: [] addons: apt: @@ -18,8 +18,16 @@ addons: matrix: allow_failures: - rust: stable + env: [] - rust: beta + env: [] include: + - rust: stable + env: [] + - rust: beta + env: [] + - rust: nightly + env: [] - rust: nightly env: - TARGET=x86_64-unknown-linux-musl @@ -39,6 +47,9 @@ matrix: - BIN_NAME=miniserve - PROPER_NAME=miniserve-osx-x86_64 os: osx + - rust: nightly-2019-04-26 + env: + - CLIPPY=true before_install: - rustup self update @@ -47,10 +58,12 @@ before_install: install: # On Apple, the default target is already the right one. - if [[ -n $TARGET && $TARGET != "x86_64-apple-darwin" ]]; then rustup target add $TARGET; fi + - if [[ -n $CLIPPY ]]; then rustup component add clippy; fi script: # If this is a normal, non-deployment build... - - if [[ -z $TARGET ]]; then cargo build --verbose && RUST_BACKTRACE=1 cargo test; fi + - if [[ -z $TARGET && -z $CLIPPY ]]; then cargo build --verbose && RUST_BACKTRACE=1 cargo test; fi + - if [[ -n $CLIPPY ]]; then cargo clippy -- --deny clippy::all; fi - if [[ -n $TARGET ]]; then cargo build --verbose --release --target $TARGET; fi before_deploy: |