diff options
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rwxr-xr-x | setup-toolchain.sh | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 984c31ace80..829c781eb08 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,7 +24,7 @@ install: - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin - del rust-toolchain - - cargo install -Z install-upgrade rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed" + - cargo install -Z install-upgrade rustup-toolchain-install-master - rustup-toolchain-install-master -f -n master - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt - rustup default master diff --git a/setup-toolchain.sh b/setup-toolchain.sh index 27c2e87f172..aac18e37946 100755 --- a/setup-toolchain.sh +++ b/setup-toolchain.sh @@ -3,14 +3,10 @@ set -e -cd "$(dirname "$0")" || exit +cd "$(dirname "$0")" -if ! command -v rustup-toolchain-install-master > /dev/null; then - cargo install \ - -Z install-upgrade \ - rustup-toolchain-install-master \ - --bin 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 rustup-toolchain-install-master -f -n master |