build: use clippy's debug build in integration test

[rust.git] / setup-toolchain.sh

diff --git a/setup-toolchain.sh b/setup-toolchain.sh
index c1c8366bf5e769a6106065d1f05091b904855a97..aac18e3794647edbcb76dca2dac99f2e884d65de 100755 (executable)
--- a/setup-toolchain.sh
+++ b/setup-toolchain.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 # Set up the appropriate rustc toolchain
 
+set -e
+
 cd "$(dirname "$0")"
 
-if ! command -v rustup-toolchain-install-master > /dev/null; then
-  cargo install rustup-toolchain-install-master --debug
+if [[ "$CI" == true ]] || ! command -v rustup-toolchain-install-master > /dev/null; then
+  cargo install -Z install-upgrade rustup-toolchain-install-master --bin rustup-toolchain-install-master
 fi
 
-RUSTC_HASH=$(git ls-remote https://github.com/rust-lang/rust.git master | awk '{print $1}')
-rustup-toolchain-install-master -f -n master "$RUSTC_HASH"
+rustup-toolchain-install-master -f -n master
 rustup override set master