Skip to content

Commit

Permalink
Auto merge of rust-lang#97756 - pietroalbini:pa-remove-azure-pipeline…
Browse files Browse the repository at this point in the history
…s, 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.
  • Loading branch information
bors committed Jun 5, 2022
2 parents 4322a78 + 6523ef4 commit fee3a45
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 136 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions src/ci/azure-pipelines/auto.yml

This file was deleted.

22 changes: 0 additions & 22 deletions src/ci/azure-pipelines/try.yml

This file was deleted.

4 changes: 0 additions & 4 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/ci/init_repo.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
#!/usr/bin/env bash

# FIXME(61301): we need to debug spurious failures with this on Windows on
# Azure, so let's print more information in the logs.
set -x

set -o errexit
set -o pipefail
set -o nounset
Expand Down
16 changes: 0 additions & 16 deletions src/ci/scripts/clean-disk.sh

This file was deleted.

2 changes: 1 addition & 1 deletion src/ci/scripts/disable-git-crlf-conversion.sh
Original file line number Diff line number Diff line change
@@ -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.
#
Expand Down
15 changes: 0 additions & 15 deletions src/ci/scripts/setup-environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 0 additions & 15 deletions src/ci/scripts/symlink-build-dir.sh

This file was deleted.

31 changes: 7 additions & 24 deletions src/ci/shared.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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!"
Expand All @@ -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!"
Expand All @@ -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!"
Expand All @@ -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!"
Expand All @@ -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!"
Expand All @@ -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!"
Expand Down

0 comments on commit fee3a45

Please sign in to comment.