Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

don't download std-docs on CI #7513

Merged
merged 7 commits into from
Nov 4, 2019
Merged

don't download std-docs on CI #7513

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5b658ab
dont download std-docs on CI
Eh2406 Oct 15, 2019
b5c5900
widows is annoying
Eh2406 Oct 15, 2019
d1de600
update is annoying
Eh2406 Oct 15, 2019
397dd68
use no-self-update
Eh2406 Nov 3, 2019
e4d5563
use curl on windows
Eh2406 Nov 3, 2019
5d35d90
add rustc-dev
Eh2406 Nov 4, 2019
e028b87
only on nightly
Eh2406 Nov 4, 2019
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
8 changes: 5 additions & 3 deletions ci/azure-install-rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@ steps:
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
rustup-init.exe -y --default-toolchain $TOOLCHAIN --profile=minimal
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This works on all OSes

Suggested change
rustup-init.exe -y --default-toolchain $TOOLCHAIN --profile=minimal
curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=$TOOLCHAIN --profile=minimal

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for the delay. I am now back from vacation. How do we best combine the branches?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using a custom script: https://github.com/lzutao/junction/blob/ci-scripts/ci/install-rustup.bash ?

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

- bash: |
set -e
rustup update $TOOLCHAIN
rustup set profile minimal
rustup component remove --toolchain=$TOOLCHAIN rust-docs || echo "already removed"
rustup update --no-self-update $TOOLCHAIN
rustup default $TOOLCHAIN
displayName: Install rust

Expand Down