diff options
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/install.sh | 4 | ||||
| -rwxr-xr-x | ci/script.sh | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/ci/install.sh b/ci/install.sh index 9e8c2e6d..af4bb776 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,6 +1,6 @@ #!/bin/bash # Add clippy for linting with nightly builds -if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then - rustup component add clippy-preview +if [ "$CLIPPY" == "true" ]; then + rustup component add clippy fi diff --git a/ci/script.sh b/ci/script.sh index 4dfc4323..c17bbbd2 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -3,9 +3,10 @@ # Check if any command failed error=false -# Run clippy on nightly builds -if [ "$TRAVIS_RUST_VERSION" == "nightly" ]; then - cargo clippy --all-features --all-targets || error=true +# Run clippy checks +if [ "$CLIPPY" == "true" ]; then + cargo clippy --all-targets + exit fi # Run test in release mode if a tag is present, to produce an optimized binary |