Skip to content

Commit 694b048

Browse files
authored
Rollup merge of rust-lang#61546 - alexcrichton:fix-azure, r=pietroalbini
azure: Fix some minor issues which have broken our configuration * Ensure that when we enable IPv6 for Docker on Linux that the various directories before writing a config file * Delete a previously installed rustup if any since it seems to interfere with Cargo's test suite.
2 parents 928f2ee + fb3bd58 commit 694b048

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

.azure-pipelines/steps/run.yml

+5
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ steps:
5050
# on since libstd tests require it
5151
- bash: |
5252
set -e
53+
sudo mkdir -p /etc/docker
5354
echo '{"ipv6":true,"fixed-cidr-v6":"fd9a:8454:6789:13f7::/64"}' | sudo tee /etc/docker/daemon.json
5455
sudo service docker restart
5556
displayName: Enable IPv6
@@ -101,6 +102,10 @@ steps:
101102

102103
- bash: |
103104
set -e
105+
# Remove any preexisting rustup installation since it can interfere
106+
# with the cargotest step and its auto-detection of things like Clippy in
107+
# the environment
108+
rustup self uninstall -y || true
104109
if [ "$IMAGE" = "" ]; then
105110
src/ci/run.sh
106111
else

0 commit comments

Comments
 (0)