Skip to content

Commit cbedd97

Browse files
committed
Auto merge of #4692 - lzutao:use-opt-profile-rtim, r=phansch
build: use release build of RTIM rustup-toolchain-install-master on Travis Windows builds is unexpectedly slower compared to when run on other OSes. This commit tries to use release build of RTIM as a mean to improve performance there. changelog: none
2 parents dbc4040 + 7d7451a commit cbedd97

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ install:
2424
- rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
2525
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
2626
- del rust-toolchain
27-
- cargo install -Z install-upgrade rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
27+
- cargo install -Z install-upgrade rustup-toolchain-install-master
2828
- rustup-toolchain-install-master -f -n master
2929
- rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
3030
- rustup default master

setup-toolchain.sh

+3-7
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,10 @@
33

44
set -e
55

6-
cd "$(dirname "$0")" || exit
6+
cd "$(dirname "$0")"
77

8-
if ! command -v rustup-toolchain-install-master > /dev/null; then
9-
cargo install \
10-
-Z install-upgrade \
11-
rustup-toolchain-install-master \
12-
--bin rustup-toolchain-install-master \
13-
--debug
8+
if [[ "$CI" == true ]] || ! command -v rustup-toolchain-install-master > /dev/null; then
9+
cargo install -Z install-upgrade rustup-toolchain-install-master --bin rustup-toolchain-install-master
1410
fi
1511

1612
rustup-toolchain-install-master -f -n master

0 commit comments

Comments
 (0)