mirror of
https://github.com/rust-lang/rust.git
synced 2025-01-24 21:53:56 +00:00
Rollup merge of #133248 - MarcoIeni:x86_64-msvc-ext-free, r=Kobzol
CI: split x86_64-msvc-ext job try-job: x86_64-msvc-ext1 try-job: x86_64-msvc-ext3
This commit is contained in:
commit
21f6ef577b
@ -384,13 +384,12 @@ auto:
|
|||||||
SCRIPT: make ci-msvc
|
SCRIPT: make ci-msvc
|
||||||
<<: *job-windows-8c
|
<<: *job-windows-8c
|
||||||
|
|
||||||
- image: x86_64-msvc-ext
|
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
|
||||||
|
- image: x86_64-msvc-ext1
|
||||||
env:
|
env:
|
||||||
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
|
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
|
||||||
HOST_TARGET: x86_64-pc-windows-msvc
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
|
||||||
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
|
<<: *job-windows
|
||||||
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
|
|
||||||
<<: *job-windows-8c
|
|
||||||
|
|
||||||
# Temporary builder to workaround CI issues
|
# Temporary builder to workaround CI issues
|
||||||
# See <https://github.com/rust-lang/rust/issues/127883>
|
# See <https://github.com/rust-lang/rust/issues/127883>
|
||||||
@ -406,6 +405,15 @@ auto:
|
|||||||
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
|
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
|
||||||
<<: *job-windows
|
<<: *job-windows
|
||||||
|
|
||||||
|
# Run `checktools.sh` and upload the toolstate file.
|
||||||
|
- image: x86_64-msvc-ext3
|
||||||
|
env:
|
||||||
|
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
|
||||||
|
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
|
||||||
|
|
||||||
# 32/64-bit MinGW builds.
|
# 32/64-bit MinGW builds.
|
||||||
#
|
#
|
||||||
# We are using MinGW with POSIX threads since LLVM requires
|
# We are using MinGW with POSIX threads since LLVM requires
|
||||||
|
Loading…
Reference in New Issue
Block a user