From 522a38b0b100758dabd71e61703eaa69403895dc Mon Sep 17 00:00:00 2001
From: Christoph Herzog <chris@theduke.at>
Date: Tue, 25 Jun 2019 15:06:57 +0200
Subject: [PATCH] (ci) Specify CARGO_HOME env var to ensure conformity
---
_build/azure-pipelines-template.yml | 2 ++
azure-pipelines.yml | 3 +++
2 files changed, 5 insertions(+)
diff --git a/_build/azure-pipelines-template.yml b/_build/azure-pipelines-template.yml
index 329abcfd..2b43c979 100644
--- a/_build/azure-pipelines-template.yml
+++ b/_build/azure-pipelines-template.yml
@@ -19,6 +19,7 @@ jobs:
- ${{ if ne(parameters.name, 'Windows') }}:
# Linux and macOS.
- script: |
+ export CARGO_HOME="$HOME/.cargo"
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
source /usr/local/cargo/env;
echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
@@ -26,6 +27,7 @@ jobs:
- ${{ if eq(parameters.name, 'Windows') }}:
# Windows.
- script: |
+ set CARGO_HOME=%USERPROFILE%\.cargo
curl -sSf -o rustup-init.exe https://win.rustup.rs
rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
set PATH=%PATH%;%USERPROFILE%\.cargo\bin
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 013a3511..85c1977a 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,6 +9,7 @@ jobs:
vmImage: ubuntu-16.04
steps:
- script: |
+ export CARGO_HOME="$HOME/.cargo"
curl https://sh.rustup.rs -sSf | sh -s -- -y
$HOME/.cargo/bin/rustup component add rustfmt
displayName: Install stable Rust
@@ -26,6 +27,7 @@ jobs:
vmImage: ubuntu-16.04
steps:
- script: |
+ export CARGO_HOME="$HOME/.cargo"
curl https://sh.rustup.rs -sSf | sh -s -- -y
$HOME/.cargo/bin/rustup component add rustfmt
displayName: Install stable Rust
@@ -79,6 +81,7 @@ jobs:
vmImage: ubuntu-16.04
steps:
- script: |
+ export CARGO_HOME="$HOME/.cargo"
curl https://sh.rustup.rs -sSf | sh -s -- -y
displayName: Install stable Rust
- script: |