Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions setup-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down