From d14680279d7f5e041046afe15736545630d5b549 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 5 Jun 2019 12:14:53 -0700
Subject: [PATCH] Attempt to fix CI

---
 ci/azure-install-rust.yml | 14 ++++++++------
 ci/run-docker.sh          |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml
index fa7eae4..c5a5312 100644
--- a/ci/azure-install-rust.yml
+++ b/ci/azure-install-rust.yml
@@ -5,15 +5,17 @@ steps:
       if [ "$toolchain" = "" ]; then
         toolchain=stable
       fi
-      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.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
+      fi
     displayName: Install rust (unix)
     condition: ne( variables['Agent.OS'], 'Windows_NT' )
 
-  - script: |
-      curl -sSf -o rustup-init.exe https://win.rustup.rs
-      rustup-init.exe -y --default-toolchain stable-%TARGET%
-      echo ##vso[task.prependpath]%USERPROFILE%\.cargo\bin
+  - bash: rustup update stable-$TOOLCHAIN && rustup default stable-$TOOLCHAIN
     displayName: Install rust (windows)
     condition: eq( variables['Agent.OS'], 'Windows_NT' )
 
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 95bd3db..e7b80c7 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -18,7 +18,7 @@ run() {
            --user $(id -u):$(id -g) \
            -e CARGO_HOME=/cargo \
            -e CARGO_TARGET_DIR=/target \
-           -v $HOME/.cargo:/cargo \
+           -v $(dirname $(dirname `which cargo`)):/cargo \
            -v `pwd`/target:/target \
            -v `pwd`:/checkout:ro \
            -v `rustc --print sysroot`:/rust:ro \