Skip to content

Commit 0a65fe3

Browse files
committed
Auto merge of #65202 - pietroalbini:scriptify-ci-config, r=<try>
ci: move most of the prepare config into scripts This PR moves most of the configuration from the CI yamls into bash scripts, driven by a small Python script (which understands and emulates the two `##vso[` commands we use). There are two reasons why we'd want to do this: * Being able to prepare the build environment locally by just running `src/ci/prepare.py` simplifies a lot setting up a local VM similar to CI (software pre-installed in the CI images won't be prepared, but it's a start anyway). * When we'll switch to GitHub Actions we'll need to either duplicate code in multiple workflows or write a preprocessor. Having all the prepare steps in a single one is going to simplify the implementation of both options. Along with the move I did a few changes to the actual scripts: * Mirrored all the remaining external URLs we download (except chocolatey) to the `rust-lang-ci-mirrors` bucket, to increase reliability and reduce the chance of supply chain attacks. I didn't audit and mirror the CI scripts outside this PR though. * Extracted CI-specific behavior (like issuing `##vso[` commands and detecting the host platform) into `shared.sh` and included it in most of the scripts. This way a switch to another CI provider will be less painful. It's possible (and easier) to review this commit-by-commit. r? @alexcrichton cc @rust-lang/infra
2 parents 03a50ae + af5cc3d commit 0a65fe3

24 files changed

+463
-289
lines changed

src/ci/azure-pipelines/auto.yml

+2
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ jobs:
315315

316316
# 32/64 bit MSVC and GNU deployment
317317
dist-x86_64-msvc:
318+
MSYS_BITS: 64
318319
RUST_CONFIGURE_ARGS: >
319320
--build=x86_64-pc-windows-msvc
320321
--target=x86_64-pc-windows-msvc,aarch64-pc-windows-msvc
@@ -324,6 +325,7 @@ jobs:
324325
DIST_REQUIRE_ALL_TOOLS: 1
325326
DEPLOY: 1
326327
dist-i686-msvc:
328+
MSYS_BITS: 32
327329
RUST_CONFIGURE_ARGS: >
328330
--build=i686-pc-windows-msvc
329331
--target=i586-pc-windows-msvc

src/ci/azure-pipelines/steps/install-clang.yml

-46
This file was deleted.

src/ci/azure-pipelines/steps/install-sccache.yml

-21
This file was deleted.

src/ci/azure-pipelines/steps/install-windows-build-deps.yml

-143
This file was deleted.

0 commit comments

Comments
 (0)