diff options
| author | bors <bors@rust-lang.org> | 2019-05-24 19:22:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-24 19:22:13 +0000 |
| commit | dec4c5201f88efbc3020b04ba96a5ee2c3b6cfcd (patch) | |
| tree | 37d6545208e7ef8c6c5c783321c7384fffd8eff9 /src/bootstrap | |
| parent | fc45382c125d940822368e866588568d78551946 (diff) | |
| parent | 2244ca3973fa4a43ef53a16826086e43eae86539 (diff) | |
| download | rust-dec4c5201f88efbc3020b04ba96a5ee2c3b6cfcd.tar.gz rust-dec4c5201f88efbc3020b04ba96a5ee2c3b6cfcd.zip | |
Auto merge of #60777 - pietroalbini:azure-pipelines, r=alexcrichton
Add Azure Pipelines configuration Huge thanks to @johnterickson and @willsmythe for writing the initial config! :heart: I applied some changes to the initial config and disabled most of the builders since we're not going to run all of them during the initial step for the evaluation. [More details about our plans for the Azure Pipelines evaluation.](https://internals.rust-lang.org/t/update-on-the-ci-investigation/10056) r? @alexcrichton @kennytm cc @rust-lang/infra @ethomson @rylev
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 4 | ||||
| -rw-r--r-- | src/bootstrap/util.rs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 07be27c2f5a..ea05b30ecef 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -80,9 +80,9 @@ TESTS_IN_2 := \ src/test/run-pass-fulldeps \ src/tools/linkchecker -appveyor-subset-1: +ci-subset-1: $(Q)$(BOOTSTRAP) test $(TESTS_IN_2:%=--exclude %) -appveyor-subset-2: +ci-subset-2: $(Q)$(BOOTSTRAP) test $(TESTS_IN_2) diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs index a162c65672f..f22f0559265 100644 --- a/src/bootstrap/util.rs +++ b/src/bootstrap/util.rs @@ -326,6 +326,8 @@ pub enum CiEnv { Travis, /// The AppVeyor environment, for Windows builds. AppVeyor, + /// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds. + AzurePipelines, } impl CiEnv { @@ -335,6 +337,8 @@ impl CiEnv { CiEnv::Travis } else if env::var("APPVEYOR").ok().map_or(false, |e| &*e == "True") { CiEnv::AppVeyor + } else if env::var("TF_BUILD").ok().map_or(false, |e| &*e == "True") { + CiEnv::AzurePipelines } else { CiEnv::None } |
