Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Commit 0e17a6c

Browse files
committed
Make sure to actually use the toolchain specified
1 parent 8789d84 commit 0e17a6c

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

ci/azure-install-rust.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ steps:
22
# Linux and macOS.
33
- script: |
44
set -e
5-
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
5+
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
6+
export PATH=$PATH:$HOME/.cargo/bin
7+
rustup toolchain install $RUSTUP_TOOLCHAIN
8+
rustup default $RUSTUP_TOOLCHAIN
69
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
710
env:
811
RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
@@ -11,18 +14,20 @@ steps:
1114
1215
# Windows.
1316
- script: |
14-
echo "windows"
1517
curl -sSf -o rustup-init.exe https://win.rustup.rs
16-
rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
18+
rustup-init.exe -y --default-toolchain none
1719
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
20+
rustup toolchain install %RUSTUP_TOOLCHAIN%
21+
rustup default %RUSTUP_TOOLCHAIN%
1822
echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
1923
env:
2024
RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
21-
displayName: Install rust (windows)
25+
displayName: "Install rust (windows)"
2226
condition: eq(variables['Agent.OS'], 'Windows_NT')
2327
2428
# All platforms.
2529
- script: |
30+
rustup toolchain list
2631
rustc -Vv
2732
cargo -V
2833
displayName: Query rust and cargo versions

0 commit comments

Comments
 (0)