From e58eb520a45cd3843eb7cfa96980be8da7f65fa2 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Mon, 16 Jul 2018 13:55:32 -0700 Subject: [PATCH] Fix travis build by removing cargo-clippy --- ci/base-tests.sh | 1 + ci/integration-tests.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/ci/base-tests.sh b/ci/base-tests.sh index 37c13fe069e..4b304f6f2a6 100755 --- a/ci/base-tests.sh +++ b/ci/base-tests.sh @@ -6,6 +6,7 @@ cargo test --features debugging mkdir -p ~/rust/cargo/bin cp target/debug/cargo-clippy ~/rust/cargo/bin/cargo-clippy cp target/debug/clippy-driver ~/rust/cargo/bin/clippy-driver +rm ~/.cargo/bin/cargo-clippy PATH=$PATH:~/rust/cargo/bin cargo clippy --all -- -D clippy cd clippy_workspace_tests && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd .. cd clippy_workspace_tests/src && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd ../.. diff --git a/ci/integration-tests.sh b/ci/integration-tests.sh index 28785f633c3..a989b261ac7 100755 --- a/ci/integration-tests.sh +++ b/ci/integration-tests.sh @@ -1,4 +1,5 @@ set -x +rm ~/.cargo/bin/cargo-clippy cargo install --force --path . echo "Running integration test for crate ${INTEGRATION}"