about summary refs log tree commit diff
path: root/src/ci/scripts
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-05 12:31:26 +0000
committerbors <bors@rust-lang.org>2022-06-05 12:31:26 +0000
commitfee3a459dd6aba8e34a5b99f0fbcb4218a1e2401 (patch)
tree98e88f503bf4609b1eea99f02ef8ea34be3744ef /src/ci/scripts
parent4322a785cc99ea5fc81dd7f5fc8ba7f7a64b08ef (diff)
parent6523ef41da79f06c883f0572e068251ed4370a1e (diff)
downloadrust-fee3a459dd6aba8e34a5b99f0fbcb4218a1e2401.tar.gz
rust-fee3a459dd6aba8e34a5b99f0fbcb4218a1e2401.zip
Auto merge of #97756 - pietroalbini:pa-remove-azure-pipelines, r=Mark-Simulacrum
Remove Azure Pipelines configuration

This PR removes the remaining Azure Pipelines configuration, now that we fully removed all the resources on the Azure side of things.
Diffstat (limited to 'src/ci/scripts')
-rwxr-xr-xsrc/ci/scripts/clean-disk.sh16
-rwxr-xr-xsrc/ci/scripts/disable-git-crlf-conversion.sh2
-rwxr-xr-xsrc/ci/scripts/setup-environment.sh15
-rwxr-xr-xsrc/ci/scripts/symlink-build-dir.sh15
4 files changed, 1 insertions, 47 deletions
diff --git a/src/ci/scripts/clean-disk.sh b/src/ci/scripts/clean-disk.sh
deleted file mode 100755
index c50de37c492..00000000000
--- a/src/ci/scripts/clean-disk.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-# This script deletes some of the Azure-provided artifacts. We don't use these,
-# and disk space is at a premium on our builders.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
-# All the Linux builds happen inside Docker.
-if isLinux; then
-    # 6.7GB
-    sudo rm -rf /opt/ghc
-    # 16GB
-    sudo rm -rf /usr/share/dotnet
-fi
diff --git a/src/ci/scripts/disable-git-crlf-conversion.sh b/src/ci/scripts/disable-git-crlf-conversion.sh
index 836145fbb8e..6de080a9fde 100755
--- a/src/ci/scripts/disable-git-crlf-conversion.sh
+++ b/src/ci/scripts/disable-git-crlf-conversion.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Disable automatic line ending conversion, which is enabled by default on
-# Azure's Windows image. Having the conversion enabled caused regressions both
+# GitHub's Windows image. Having the conversion enabled caused regressions both
 # in our test suite (it broke miri tests) and in the ecosystem, since we
 # started shipping install scripts with CRLF endings instead of the old LF.
 #
diff --git a/src/ci/scripts/setup-environment.sh b/src/ci/scripts/setup-environment.sh
index 411ef6f9b28..0bc35f93283 100755
--- a/src/ci/scripts/setup-environment.sh
+++ b/src/ci/scripts/setup-environment.sh
@@ -8,21 +8,6 @@ IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
-# Since matrix variables are readonly in Azure Pipelines, we take
-# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS
-# which downstream steps can alter
-if isAzurePipelines; then
-    # macOS ships with Bash 3.16, so we cannot use [[ -v FOO ]],
-    # which was introduced in Bash 4.2
-    if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then
-        INITIAL_RUST_CONFIG=""
-        echo "No initial Rust configure args set"
-    else
-        INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"
-        ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
-    fi
-fi
-
 # Load extra environment variables
 vars="${EXTRA_VARIABLES-}"
 echo "${vars}" | jq '' >/dev/null  # Validate JSON and exit on errors
diff --git a/src/ci/scripts/symlink-build-dir.sh b/src/ci/scripts/symlink-build-dir.sh
deleted file mode 100755
index 23849f7047c..00000000000
--- a/src/ci/scripts/symlink-build-dir.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# We've had multiple issues with the default disk running out of disk space
-# during builds, and it looks like other disks mounted in the VMs have more
-# space available. This script synlinks the build directory to those other
-# disks, in the CI providers and OSes affected by this.
-
-set -euo pipefail
-IFS=$'\n\t'
-
-source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
-
-if isWindows && isAzurePipelines; then
-    cmd //c "mkdir c:\\MORE_SPACE"
-    cmd //c "mklink /J build c:\\MORE_SPACE"
-fi