Browse Source

Attempt to fix CI

Alex Crichton 5 years ago
parent
commit
20827ad38f
1 changed files with 9 additions and 5 deletions
  1. 9 5
      ci/azure-install-rust.yml

+ 9 - 5
ci/azure-install-rust.yml

@@ -4,17 +4,21 @@ parameters:
 steps:
 steps:
   - bash: |
   - bash: |
       set -e
       set -e
-      curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
-      echo "##vso[task.prependpath]$HOME/.cargo/bin"
+      if command -v rustup; then
+        rustup update $TOOLCHAIN
+        rustup default $TOOLCHAIN
+      else
+        curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $TOOLCHAIN
+        echo "##vso[task.prependpath]$HOME/.cargo/bin"
+      fi
     displayName: Install rust
     displayName: Install rust
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     env:
     env:
       TOOLCHAIN: ${{ parameters.toolchain }}
       TOOLCHAIN: ${{ parameters.toolchain }}
 
 
   - script: |
   - script: |
-      curl -sSf -o rustup-init.exe https://win.rustup.rs
-      rustup-init.exe -y --default-toolchain %TOOLCHAIN%-%TARGET%
-      echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
+      rustup update --no-self-update %TOOLCHAIN%-%TARGET%
+      rustup default %TOOLCHAIN%-%TARGET%
     displayName: Install rust
     displayName: Install rust
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
     env:
     env: