From 0d83008f7ac55d854d9ff2fac8a03c7bd42915d0 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 5 Jun 2019 16:09:27 -0700
Subject: [PATCH] Attempt to fix CI

---
 .../compiler-builtins/ci/azure-install-rust.yml    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/compiler-builtins/ci/azure-install-rust.yml b/library/compiler-builtins/ci/azure-install-rust.yml
index f44f8c59dc6f..d0255f85b279 100644
--- a/library/compiler-builtins/ci/azure-install-rust.yml
+++ b/library/compiler-builtins/ci/azure-install-rust.yml
@@ -4,17 +4,21 @@ parameters:
 steps:
   - bash: |
       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
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
     env:
       TOOLCHAIN: ${{ parameters.toolchain }}
 
   - 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
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
     env: