Skip to content

Commit 2a85e02

Browse files
Rollup merge of rust-lang#112663 - klensy:dusk-and-dawn, r=pietroalbini
cleanup azure leftovers Continuation of rust-lang#97756
2 parents 90e51f1 + 903b3d3 commit 2a85e02

File tree

3 files changed

+1
-9
lines changed

3 files changed

+1
-9
lines changed

src/bootstrap/util.rs

-2
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<
159159
pub enum CiEnv {
160160
/// Not a CI environment.
161161
None,
162-
/// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds.
163-
AzurePipelines,
164162
/// The GitHub Actions environment, for Linux (including Docker), Windows and macOS builds.
165163
GitHubActions,
166164
}

src/ci/docker/run.sh

-2
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ docker \
254254
--env DEPLOY \
255255
--env DEPLOY_ALT \
256256
--env CI \
257-
--env TF_BUILD \
258-
--env BUILD_SOURCEBRANCHNAME \
259257
--env GITHUB_ACTIONS \
260258
--env GITHUB_REF \
261259
--env TOOLSTATE_REPO_ACCESS_TOKEN \

src/tools/build_helper/src/ci.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@ use std::process::Command;
44
pub enum CiEnv {
55
/// Not a CI environment.
66
None,
7-
/// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds.
8-
AzurePipelines,
97
/// The GitHub Actions environment, for Linux (including Docker), Windows and macOS builds.
108
GitHubActions,
119
}
1210

1311
impl CiEnv {
1412
/// Obtains the current CI environment.
1513
pub fn current() -> CiEnv {
16-
if std::env::var("TF_BUILD").map_or(false, |e| e == "True") {
17-
CiEnv::AzurePipelines
18-
} else if std::env::var("GITHUB_ACTIONS").map_or(false, |e| e == "true") {
14+
if std::env::var("GITHUB_ACTIONS").map_or(false, |e| e == "true") {
1915
CiEnv::GitHubActions
2016
} else {
2117
CiEnv::None

0 commit comments

Comments
 (0)