Skip to content

Commit fee3a45

Browse files
committed
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.
2 parents 4322a78 + 6523ef4 commit fee3a45

File tree

10 files changed

+8
-136
lines changed

10 files changed

+8
-136
lines changed

.github/workflows/ci.yml

-9
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,6 @@ jobs:
9898
- name: install WIX
9999
run: src/ci/scripts/install-wix.sh
100100
if: success() && !env.SKIP_JOB
101-
- name: ensure the build happens on a partition with enough space
102-
run: src/ci/scripts/symlink-build-dir.sh
103-
if: success() && !env.SKIP_JOB
104101
- name: disable git crlf conversion
105102
run: src/ci/scripts/disable-git-crlf-conversion.sh
106103
if: success() && !env.SKIP_JOB
@@ -496,9 +493,6 @@ jobs:
496493
- name: install WIX
497494
run: src/ci/scripts/install-wix.sh
498495
if: success() && !env.SKIP_JOB
499-
- name: ensure the build happens on a partition with enough space
500-
run: src/ci/scripts/symlink-build-dir.sh
501-
if: success() && !env.SKIP_JOB
502496
- name: disable git crlf conversion
503497
run: src/ci/scripts/disable-git-crlf-conversion.sh
504498
if: success() && !env.SKIP_JOB
@@ -609,9 +603,6 @@ jobs:
609603
- name: install WIX
610604
run: src/ci/scripts/install-wix.sh
611605
if: success() && !env.SKIP_JOB
612-
- name: ensure the build happens on a partition with enough space
613-
run: src/ci/scripts/symlink-build-dir.sh
614-
if: success() && !env.SKIP_JOB
615606
- name: disable git crlf conversion
616607
run: src/ci/scripts/disable-git-crlf-conversion.sh
617608
if: success() && !env.SKIP_JOB

src/ci/azure-pipelines/auto.yml

-26
This file was deleted.

src/ci/azure-pipelines/try.yml

-22
This file was deleted.

src/ci/github-actions/ci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,6 @@ x--expand-yaml-anchors--remove:
161161
run: src/ci/scripts/install-wix.sh
162162
<<: *step
163163

164-
- name: ensure the build happens on a partition with enough space
165-
run: src/ci/scripts/symlink-build-dir.sh
166-
<<: *step
167-
168164
- name: disable git crlf conversion
169165
run: src/ci/scripts/disable-git-crlf-conversion.sh
170166
<<: *step

src/ci/init_repo.sh

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
#!/usr/bin/env bash
22

3-
# FIXME(61301): we need to debug spurious failures with this on Windows on
4-
# Azure, so let's print more information in the logs.
5-
set -x
6-
73
set -o errexit
84
set -o pipefail
95
set -o nounset

src/ci/scripts/clean-disk.sh

-16
This file was deleted.

src/ci/scripts/disable-git-crlf-conversion.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
# Disable automatic line ending conversion, which is enabled by default on
3-
# Azure's Windows image. Having the conversion enabled caused regressions both
3+
# GitHub's Windows image. Having the conversion enabled caused regressions both
44
# in our test suite (it broke miri tests) and in the ecosystem, since we
55
# started shipping install scripts with CRLF endings instead of the old LF.
66
#

src/ci/scripts/setup-environment.sh

-15
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ IFS=$'\n\t'
88

99
source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
1010

11-
# Since matrix variables are readonly in Azure Pipelines, we take
12-
# INITIAL_RUST_CONFIGURE_ARGS and establish RUST_CONFIGURE_ARGS
13-
# which downstream steps can alter
14-
if isAzurePipelines; then
15-
# macOS ships with Bash 3.16, so we cannot use [[ -v FOO ]],
16-
# which was introduced in Bash 4.2
17-
if [[ -z "${INITIAL_RUST_CONFIGURE_ARGS+x}" ]]; then
18-
INITIAL_RUST_CONFIG=""
19-
echo "No initial Rust configure args set"
20-
else
21-
INITIAL_RUST_CONFIG="${INITIAL_RUST_CONFIGURE_ARGS}"
22-
ciCommandSetEnv RUST_CONFIGURE_ARGS "${INITIAL_RUST_CONFIG}"
23-
fi
24-
fi
25-
2611
# Load extra environment variables
2712
vars="${EXTRA_VARIABLES-}"
2813
echo "${vars}" | jq '' >/dev/null # Validate JSON and exit on errors

src/ci/scripts/symlink-build-dir.sh

-15
This file was deleted.

src/ci/shared.sh

+7-24
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ function retry {
2828
}
2929

3030
function isCI {
31-
[[ "${CI-false}" = "true" ]] || isAzurePipelines || isGitHubActions
32-
}
33-
34-
function isAzurePipelines {
35-
[[ "${TF_BUILD-False}" = "True" ]]
31+
[[ "${CI-false}" = "true" ]] || isGitHubActions
3632
}
3733

3834
function isGitHubActions {
@@ -63,9 +59,7 @@ function isCiBranch {
6359
fi
6460
name="$1"
6561

66-
if isAzurePipelines; then
67-
[[ "${BUILD_SOURCEBRANCHNAME}" = "${name}" ]]
68-
elif isGitHubActions; then
62+
if isGitHubActions; then
6963
[[ "${GITHUB_REF}" = "refs/heads/${name}" ]]
7064
else
7165
echo "isCiBranch only works inside CI!"
@@ -74,10 +68,7 @@ function isCiBranch {
7468
}
7569

7670
function ciBaseBranch {
77-
if isAzurePipelines; then
78-
echo "unsupported on Azure Pipelines"
79-
exit 1
80-
elif isGitHubActions; then
71+
if isGitHubActions; then
8172
echo "${GITHUB_BASE_REF#refs/heads/}"
8273
else
8374
echo "ciBaseBranch only works inside CI!"
@@ -86,9 +77,7 @@ function ciBaseBranch {
8677
}
8778

8879
function ciCommit {
89-
if isAzurePipelines; then
90-
echo "${BUILD_SOURCEVERSION}"
91-
elif isGitHubActions; then
80+
if isGitHubActions; then
9281
echo "${GITHUB_SHA}"
9382
else
9483
echo "ciCommit only works inside CI!"
@@ -97,9 +86,7 @@ function ciCommit {
9786
}
9887

9988
function ciCheckoutPath {
100-
if isAzurePipelines; then
101-
echo "${BUILD_SOURCESDIRECTORY}"
102-
elif isGitHubActions; then
89+
if isGitHubActions; then
10390
echo "${GITHUB_WORKSPACE}"
10491
else
10592
echo "ciCheckoutPath only works inside CI!"
@@ -114,9 +101,7 @@ function ciCommandAddPath {
114101
fi
115102
path="$1"
116103

117-
if isAzurePipelines; then
118-
echo "##vso[task.prependpath]${path}"
119-
elif isGitHubActions; then
104+
if isGitHubActions; then
120105
echo "${path}" >> "${GITHUB_PATH}"
121106
else
122107
echo "ciCommandAddPath only works inside CI!"
@@ -132,9 +117,7 @@ function ciCommandSetEnv {
132117
name="$1"
133118
value="$2"
134119

135-
if isAzurePipelines; then
136-
echo "##vso[task.setvariable variable=${name}]${value}"
137-
elif isGitHubActions; then
120+
if isGitHubActions; then
138121
echo "${name}=${value}" >> "${GITHUB_ENV}"
139122
else
140123
echo "ciCommandSetEnv only works inside CI!"

0 commit comments

Comments
 (0)