Skip to content

Commit 1b6a0a6

Browse files
committed
Rustup is already included in latest Windows image
1 parent 3b7cebb commit 1b6a0a6

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,12 @@ jobs:
4646
condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
4747
displayName: 'Install Rust (Linux/macOS)'
4848
49-
- script: curl -sSf -o rustup-init.exe https://win.rustup.rs && rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
49+
- bash: rustup default $RUSTUP_TOOLCHAIN
5050
condition: eq( variables['Agent.OS'], 'Windows_NT' )
51-
displayName: 'Install Rust (Windows)'
51+
displayName: 'Set Rust Toolchain (Windows)'
5252

53-
- script: |
54-
echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin
55-
condition: eq( variables['Agent.OS'], 'Windows_NT' )
56-
displayName: 'Add ~/.cargo/bin to PATH (Windows)'
53+
- bash: rustup update $RUSTUP_TOOLCHAIN
54+
displayName: 'Run Rustup Update'
5755

5856
- script: |
5957
rustc -Vv
@@ -107,14 +105,12 @@ jobs:
107105
condition: or(eq( variables['Agent.OS'], 'Linux' ), eq( variables['Agent.OS'], 'Darwin' ))
108106
displayName: 'Install Rust (Linux/macOS)'
109107
110-
- script: curl -sSf -o rustup-init.exe https://win.rustup.rs && rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
108+
- bash: rustup default $RUSTUP_TOOLCHAIN
111109
condition: eq( variables['Agent.OS'], 'Windows_NT' )
112-
displayName: 'Install Rust (Windows)'
110+
displayName: 'Set Rust Toolchain (Windows)'
113111

114-
- script: |
115-
echo ##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin
116-
condition: eq( variables['Agent.OS'], 'Windows_NT' )
117-
displayName: 'Add ~/.cargo/bin to PATH (Windows)'
112+
- bash: rustup update $RUSTUP_TOOLCHAIN
113+
displayName: 'Run Rustup Update'
118114

119115
- script: |
120116
rustc -Vv

0 commit comments

Comments
 (0)