From 430b89c1599abde4fc8520ffcb0e25d9034bea8d Mon Sep 17 00:00:00 2001 From: Christian Duerr Date: Wed, 23 Jan 2019 22:04:45 +0000 Subject: Move clippy tests to stable The clippy tests had to be run on nightly previously since it wasn't available with the stable compiler yet, however this had the potential to fail a lot since not all nightly builds offer clippy. Since clippy is now available for stable rust, moving clippy to a stable build should make sure that the failure rate of the CI job is cut down to a minimum. This fixes https://github.com/jwilm/alacritty/issues/2007. --- ci/install.sh | 4 ++-- ci/script.sh | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'ci') 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 -- cgit