Skip to content

Commit d4bb00a

Browse files
committed
Use installed rustup
1 parent 7507f5d commit d4bb00a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

ci/azure-install-rust.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ steps:
1616
condition: ne( variables['Agent.OS'], 'Windows_NT' )
1717
- script: |
1818
if not defined TOOLCHAIN set TOOLCHAIN=nightly
19-
curl -sSf -o rustup-init.exe https://win.rustup.rs
20-
rustup-init.exe -y --default-toolchain %TOOLCHAIN%-%TARGET%
21-
echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
19+
rustup update %TOOLCHAIN%
20+
rustup default %TOOLCHAIN%
2221
displayName: Install rust (windows)
2322
condition: eq( variables['Agent.OS'], 'Windows_NT' )
2423
- script: |
@@ -31,9 +30,9 @@ steps:
3130
- script: if defined TARGET rustup target add %TARGET%
3231
condition: eq( variables['Agent.OS'], 'Windows_NT' )
3332
displayName: Install target (windows)
34-
- script: if defined MSYS_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
35-
condition: eq( variables['Agent.OS'], 'Windows_NT' )
36-
displayName: Fix MinGW (windows)
33+
#- script: if defined MSYS_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
34+
# condition: eq( variables['Agent.OS'], 'Windows_NT' )
35+
# displayName: Fix MinGW (windows)
3736
- script: |
3837
set -ex
3938
rustc -Vv

0 commit comments

Comments
 (0)