diff options
| author | Michael Goulet <michael@errs.io> | 2023-06-18 13:17:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 13:17:06 -0700 |
| commit | 2a85e02428c2e136d25463c7b8cffb89da2ebf0a (patch) | |
| tree | d931a8d3b8a00f7888217ef53bce570508f794c6 /src | |
| parent | 90e51f110c32b6c0907ceec60038ccd1ece2e5b5 (diff) | |
| parent | 903b3d36db81cad9d1e23b62f09d655d93aad1ac (diff) | |
| download | rust-2a85e02428c2e136d25463c7b8cffb89da2ebf0a.tar.gz rust-2a85e02428c2e136d25463c7b8cffb89da2ebf0a.zip | |
Rollup merge of #112663 - klensy:dusk-and-dawn, r=pietroalbini
cleanup azure leftovers Continuation of #97756
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/util.rs | 2 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 2 | ||||
| -rw-r--r-- | src/tools/build_helper/src/ci.rs | 6 |
3 files changed, 1 insertions, 9 deletions
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index 7e29f671f02..1ec49f80d63 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -159,8 +159,6 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result< pub enum CiEnv { /// Not a CI environment. None, - /// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds. - AzurePipelines, /// The GitHub Actions environment, for Linux (including Docker), Windows and macOS builds. GitHubActions, } diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 2fe3438e0fe..0a098467d94 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -254,8 +254,6 @@ docker \ --env DEPLOY \ --env DEPLOY_ALT \ --env CI \ - --env TF_BUILD \ - --env BUILD_SOURCEBRANCHNAME \ --env GITHUB_ACTIONS \ --env GITHUB_REF \ --env TOOLSTATE_REPO_ACCESS_TOKEN \ diff --git a/src/tools/build_helper/src/ci.rs b/src/tools/build_helper/src/ci.rs index d106e5b339b..893195b69c2 100644 --- a/src/tools/build_helper/src/ci.rs +++ b/src/tools/build_helper/src/ci.rs @@ -4,8 +4,6 @@ use std::process::Command; pub enum CiEnv { /// Not a CI environment. None, - /// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds. - AzurePipelines, /// The GitHub Actions environment, for Linux (including Docker), Windows and macOS builds. GitHubActions, } @@ -13,9 +11,7 @@ pub enum CiEnv { impl CiEnv { /// Obtains the current CI environment. pub fn current() -> CiEnv { - if std::env::var("TF_BUILD").map_or(false, |e| e == "True") { - CiEnv::AzurePipelines - } else if std::env::var("GITHUB_ACTIONS").map_or(false, |e| e == "true") { + if std::env::var("GITHUB_ACTIONS").map_or(false, |e| e == "true") { CiEnv::GitHubActions } else { CiEnv::None |