From 0b88e5a87e4b20810d1b2a2964cbacd4a58e64b6 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Tue, 4 Jun 2019 07:30:33 -0700 Subject: [PATCH 1/2] azure: Make sure docker directory exists Looks like the Azure image changed recently so let's account for that! --- .azure-pipelines/steps/run.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index cfa28a6a1d70f..05b14eb45b216 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -50,6 +50,7 @@ steps: # on since libstd tests require it - bash: | set -e + sudo mkdir -p /etc/docker echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json sudo service docker restart displayName: Enable IPv6 From fb3bd58e4f75c6752d0e2d32a04270044515c00d Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 5 Jun 2019 07:36:19 -0700 Subject: [PATCH 2/2] azure: Uninstall previous rustc from builders if any Looks like Azure has updated images recently to install Rust by default, but that can interfere with our own compiler (for example Cargo's test suite we think) so be sure to uninstall it before proceeding. --- .azure-pipelines/steps/run.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.azure-pipelines/steps/run.yml b/.azure-pipelines/steps/run.yml index 05b14eb45b216..a646b34fe7d02 100644 --- a/.azure-pipelines/steps/run.yml +++ b/.azure-pipelines/steps/run.yml @@ -102,6 +102,10 @@ steps: - bash: | set -e + # Remove any preexisting rustup installation since it can interfere + # with the cargotest step and its auto-detection of things like Clippy in + # the environment + rustup self uninstall -y || true if [ "$IMAGE" = "" ]; then src/ci/run.sh else