diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 451116f320d..a7be9978c0b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -98,9 +98,6 @@ jobs:
- name: install WIX
run: src/ci/scripts/install-wix.sh
if: success() && !env.SKIP_JOB
- - name: ensure the build happens on a partition with enough space
- run: src/ci/scripts/symlink-build-dir.sh
- if: success() && !env.SKIP_JOB
- name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh
if: success() && !env.SKIP_JOB
@@ -496,9 +493,6 @@ jobs:
- name: install WIX
run: src/ci/scripts/install-wix.sh
if: success() && !env.SKIP_JOB
- - name: ensure the build happens on a partition with enough space
- run: src/ci/scripts/symlink-build-dir.sh
- if: success() && !env.SKIP_JOB
- name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh
if: success() && !env.SKIP_JOB
@@ -609,9 +603,6 @@ jobs:
- name: install WIX
run: src/ci/scripts/install-wix.sh
if: success() && !env.SKIP_JOB
- - name: ensure the build happens on a partition with enough space
- run: src/ci/scripts/symlink-build-dir.sh
- if: success() && !env.SKIP_JOB
- name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh
if: success() && !env.SKIP_JOB
diff --git a/src/ci/azure-pipelines/auto.yml b/src/ci/azure-pipelines/auto.yml
deleted file mode 100644
index 37c2e9bc35a..00000000000
--- a/src/ci/azure-pipelines/auto.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-#####################################
-## READ BEFORE CHANGING THIS ##
-#####################################
-
-# We're in the process of evaluating GitHub Actions as a possible replacement
-# for Azure Pipelines, and at the moment the configuration is duplicated
-# between the two CI providers. Be sure to also change the configuration in
-# src/ci/github-actions when changing this file.
-
-#####################################
-
-#
-# Azure Pipelines "auto" branch build for Rust on macOS
-#
-
-pr: none
-trigger:
- - auto
-
-jobs:
-- job: Dummy
- timeoutInMinutes: 600
- pool:
- vmImage: ubuntu-16.04
- steps:
- - bash: echo "We're running this job since bors is still gating on Azure"
diff --git a/src/ci/azure-pipelines/try.yml b/src/ci/azure-pipelines/try.yml
deleted file mode 100644
index 62bb6f47334..00000000000
--- a/src/ci/azure-pipelines/try.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-#####################################
-## READ BEFORE CHANGING THIS ##
-#####################################
-
-# We're in the process of evaluating GitHub Actions as a possible replacement
-# for Azure Pipelines, and at the moment the configuration is duplicated
-# between the two CI providers. Be sure to also change the configuration in
-# src/ci/github-actions when changing this file.
-
-#####################################
-
-pr: none
-trigger:
-- try
-
-jobs:
-- job: Dummy
- timeoutInMinutes: 600
- pool:
- vmImage: ubuntu-16.04
- steps:
- - bash: echo "We're running this job since bors is still gating on Azure"
diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml
index 173ee170c9f..57832ac2b95 100644
--- a/src/ci/github-actions/ci.yml
+++ b/src/ci/github-actions/ci.yml
@@ -161,10 +161,6 @@ x--expand-yaml-anchors--remove:
run: src/ci/scripts/install-wix.sh
<<: *step
- - name: ensure the build happens on a partition with enough space
- run: src/ci/scripts/symlink-build-dir.sh
- <<: *step
-
- name: disable git crlf conversion
run: src/ci/scripts/disable-git-crlf-conversion.sh
<<: *step
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
diff --git a/src/ci/shared.sh b/src/ci/shared.sh
index 1f218bc8346..8a88c56194c 100644
--- a/src/ci/shared.sh
+++ b/src/ci/shared.sh
@@ -28,11 +28,7 @@ function retry {
}
function isCI {
- [[ "${CI-false}" = "true" ]] || isAzurePipelines || isGitHubActions
-}
-
-function isAzurePipelines {
- [[ "${TF_BUILD-False}" = "True" ]]
+ [[ "${CI-false}" = "true" ]] || isGitHubActions
}
function isGitHubActions {
@@ -63,9 +59,7 @@ function isCiBranch {
fi
name="$1"
- if isAzurePipelines; then
- [[ "${BUILD_SOURCEBRANCHNAME}" = "${name}" ]]
- elif isGitHubActions; then
+ if isGitHubActions; then
[[ "${GITHUB_REF}" = "refs/heads/${name}" ]]
else
echo "isCiBranch only works inside CI!"
@@ -74,10 +68,7 @@ function isCiBranch {
}
function ciBaseBranch {
- if isAzurePipelines; then
- echo "unsupported on Azure Pipelines"
- exit 1
- elif isGitHubActions; then
+ if isGitHubActions; then
echo "${GITHUB_BASE_REF#refs/heads/}"
else
echo "ciBaseBranch only works inside CI!"
@@ -86,9 +77,7 @@ function ciBaseBranch {
}
function ciCommit {
- if isAzurePipelines; then
- echo "${BUILD_SOURCEVERSION}"
- elif isGitHubActions; then
+ if isGitHubActions; then
echo "${GITHUB_SHA}"
else
echo "ciCommit only works inside CI!"
@@ -97,9 +86,7 @@ function ciCommit {
}
function ciCheckoutPath {
- if isAzurePipelines; then
- echo "${BUILD_SOURCESDIRECTORY}"
- elif isGitHubActions; then
+ if isGitHubActions; then
echo "${GITHUB_WORKSPACE}"
else
echo "ciCheckoutPath only works inside CI!"
@@ -114,9 +101,7 @@ function ciCommandAddPath {
fi
path="$1"
- if isAzurePipelines; then
- echo "##vso[task.prependpath]${path}"
- elif isGitHubActions; then
+ if isGitHubActions; then
echo "${path}" >> "${GITHUB_PATH}"
else
echo "ciCommandAddPath only works inside CI!"
@@ -132,9 +117,7 @@ function ciCommandSetEnv {
name="$1"
value="$2"
- if isAzurePipelines; then
- echo "##vso[task.setvariable variable=${name}]${value}"
- elif isGitHubActions; then
+ if isGitHubActions; then
echo "${name}=${value}" >> "${GITHUB_ENV}"
else
echo "ciCommandSetEnv only works inside CI!"