From 3e03b188b45112d39fbeaf3d2ef500e5faaf8f41 Mon Sep 17 00:00:00 2001 From: Bradlee Speice Date: Thu, 11 Jun 2020 13:05:21 -0400 Subject: [PATCH] Disable clippy component for 1.28 --- .travis.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e7a618..a586154 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ jobs: os: linux - rust: 1.28.0 os: linux + env: DISABLE_TOOLS=true - rust: stable os: osx - rust: stable-msvc @@ -20,12 +21,10 @@ before_script: - rustup show # CMake doesn't like the `sh.exe` provided by Git being in PATH - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then rm "C:/Program Files/Git/usr/bin/sh.exe"; fi - - rustup component add clippy - - rustup component add rustfmt + - if [[ "$DISABLE_CLIPPY" == "" ]]; then rustup component add clippy; rustup component add rustfmt; fi script: - - cargo clippy --all - - cargo fmt --all -- --check + - if [[ "$DISABLE_CLIPPY" == "" ]]; then cargo clippy --all && cargo fmt --all -- --check; fi # For default build, split up compilation and tests so we can track build times - cargo test --no-run @@ -33,14 +32,6 @@ script: - cargo test --release --no-run - cargo test --release - # Run tests using static linking - - cd "$TRAVIS_BUILD_DIR/libaeron-sys" - - cargo test --features "static" - - - cd "$TRAVIS_BUILD_DIR/libaeron_driver-sys" - - cargo test --features "static" - - branches: only: - master