diff options
| author | bors <bors@rust-lang.org> | 2024-05-10 00:04:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-10 00:04:22 +0000 |
| commit | a6e87c546dd806b2f8eb7bb314defc56dc190e4d (patch) | |
| tree | 8bc87b8009e0579727c4b18ebfb84de70f2f036a /src/ci/github-actions | |
| parent | 8f9080db423ca0fb6bef0686ce9a93940cdf1f13 (diff) | |
| parent | 5212e07a4e8c442a8e9024c929a73f308299fea3 (diff) | |
| download | rust-a6e87c546dd806b2f8eb7bb314defc56dc190e4d.tar.gz rust-a6e87c546dd806b2f8eb7bb314defc56dc190e4d.zip | |
Auto merge of #124850 - dpaoliello:clang2022, r=Kobzol
Upgrade pre-built Clang used in MSVC and MacOS builds, move MSVC builds to Server 2022 Fixes #92948 Example working MacOS and Windows builds: <https://github.com/rust-lang/rust/actions/runs/8989360201> There is a [bug in Clang 18](https://github.com/llvm/llvm-project/pull/81849) that causes issues when building for Arm64 in later parts of the build (specifically `libgit2`). As a workaround, we will still use the pre-built Clang to build LLVM but will use MSVC for the rest of the Arm64 build.
Diffstat (limited to 'src/ci/github-actions')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 20b1a55ffb8..04888dc09b5 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -32,14 +32,6 @@ runners: os: windows-2022-16core-64gb <<: *base-job - - &job-windows-2019-8c - os: windows-2019-8core-32gb - <<: *base-job - - - &job-windows-2019-16c - os: windows-2019-16core-64gb - <<: *base-job - - &job-aarch64-linux os: [ self-hosted, ARM64, linux ] @@ -349,13 +341,13 @@ auto: env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler SCRIPT: make ci-msvc - <<: *job-windows-2019-8c + <<: *job-windows-8c - image: i686-msvc env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc SCRIPT: make ci-msvc - <<: *job-windows-2019-8c + <<: *job-windows-8c - image: x86_64-msvc-ext env: @@ -363,7 +355,7 @@ auto: HOST_TARGET: x86_64-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json DEPLOY_TOOLSTATES_JSON: toolstates-windows.json - <<: *job-windows-2019-8c + <<: *job-windows-8c # 32/64-bit MinGW builds. # @@ -414,7 +406,7 @@ auto: --set rust.codegen-units=1 SCRIPT: python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 - <<: *job-windows-2019-8c + <<: *job-windows-8c - image: dist-i686-msvc env: @@ -426,7 +418,7 @@ auto: --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 - <<: *job-windows-2019-8c + <<: *job-windows-8c - image: dist-aarch64-msvc env: @@ -437,7 +429,7 @@ auto: --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths DIST_REQUIRE_ALL_TOOLS: 1 - <<: *job-windows-2019-8c + <<: *job-windows-8c - image: dist-i686-mingw env: @@ -471,4 +463,4 @@ auto: env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths - <<: *job-windows-2019-8c + <<: *job-windows-8c |