From 5b658ab9ee755445a50b4fb910897639be786f5f Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Tue, 15 Oct 2019 11:17:14 -0400 Subject: [PATCH 1/7] dont download std-docs on CI --- ci/azure-install-rust.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index c48d0d0155f..9d47a7cd6b4 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -4,12 +4,13 @@ steps: if command -v rustup; then echo `command -v rustup` `rustup -V` already installed rustup self update + rustup set profile minimal elif [ "$AGENT_OS" = "Windows_NT" ]; then curl -sSf -o rustup-init.exe https://win.rustup.rs - rustup-init.exe -y --default-toolchain $TOOLCHAIN + rustup-init.exe -y --default-toolchain $TOOLCHAIN --profile=minimal echo "##vso[task.prependpath]$USERPROFILE/.cargo/bin" else - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN + curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN --profile=minimal echo "##vso[task.prependpath]$HOME/.cargo/bin" fi displayName: Install rustup From b5c5900e7e64e9c0ec3c71224d4d7de94510e096 Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Tue, 15 Oct 2019 11:54:00 -0400 Subject: [PATCH 2/7] widows is annoying --- ci/azure-install-rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 9d47a7cd6b4..05084410a0b 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -4,7 +4,6 @@ steps: if command -v rustup; then echo `command -v rustup` `rustup -V` already installed rustup self update - rustup set profile minimal elif [ "$AGENT_OS" = "Windows_NT" ]; then curl -sSf -o rustup-init.exe https://win.rustup.rs rustup-init.exe -y --default-toolchain $TOOLCHAIN --profile=minimal @@ -17,6 +16,7 @@ steps: - bash: | set -e + rustup set profile minimal rustup update $TOOLCHAIN rustup default $TOOLCHAIN displayName: Install rust From d1de600cd54631e0b854ff7648dc0cdb7aa2835c Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Tue, 15 Oct 2019 13:21:34 -0400 Subject: [PATCH 3/7] update is annoying --- ci/azure-install-rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 05084410a0b..7325b939c6b 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -17,6 +17,7 @@ steps: - bash: | set -e rustup set profile minimal + rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed" rustup update $TOOLCHAIN rustup default $TOOLCHAIN displayName: Install rust From 397dd68b5cad2c3d68318456b0341563ea52c943 Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Sat, 2 Nov 2019 21:38:55 -0400 Subject: [PATCH 4/7] use no-self-update --- ci/azure-install-rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 7325b939c6b..131b538de2f 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -18,7 +18,7 @@ steps: set -e rustup set profile minimal rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed" - rustup update $TOOLCHAIN + rustup update --no-self-update $TOOLCHAIN rustup default $TOOLCHAIN displayName: Install rust From e4d5563ed3c81860b98beeccb70873ece45a6336 Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Sun, 3 Nov 2019 10:51:18 -0500 Subject: [PATCH 5/7] use curl on windows --- ci/azure-install-rust.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index 131b538de2f..f583cd39814 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -4,12 +4,8 @@ steps: if command -v rustup; then echo `command -v rustup` `rustup -V` already installed rustup self update - elif [ "$AGENT_OS" = "Windows_NT" ]; then - curl -sSf -o rustup-init.exe https://win.rustup.rs - rustup-init.exe -y --default-toolchain $TOOLCHAIN --profile=minimal - echo "##vso[task.prependpath]$USERPROFILE/.cargo/bin" else - curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN --profile=minimal + curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain="$TOOLCHAIN" --profile=minimal echo "##vso[task.prependpath]$HOME/.cargo/bin" fi displayName: Install rustup From 5d35d9022388dd36fcb5bd559046c81616c55c8c Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Mon, 4 Nov 2019 15:05:12 -0500 Subject: [PATCH 6/7] add rustc-dev --- ci/azure-install-rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index f583cd39814..d5fd717e570 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -15,6 +15,7 @@ steps: rustup set profile minimal rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed" rustup update --no-self-update $TOOLCHAIN + rustup component add --toolchain=$TOOLCHAIN rustc-dev rustup default $TOOLCHAIN displayName: Install rust From e028b8765c8dbd281c83d13be6547da952d95f9a Mon Sep 17 00:00:00 2001 From: Eh2406 Date: Mon, 4 Nov 2019 16:14:46 -0500 Subject: [PATCH 7/7] only on nightly --- ci/azure-install-rust.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index d5fd717e570..60fbd2ffe84 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -15,7 +15,9 @@ steps: rustup set profile minimal rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed" rustup update --no-self-update $TOOLCHAIN - rustup component add --toolchain=$TOOLCHAIN rustc-dev + if [ "$TOOLCHAIN" = "nightly" ]; then + rustup component add --toolchain=$TOOLCHAIN rustc-dev + fi rustup default $TOOLCHAIN displayName: Install rust