File tree 1 file changed +14
-6
lines changed
1 file changed +14
-6
lines changed Original file line number Diff line number Diff line change @@ -384,13 +384,12 @@ auto:
384
384
SCRIPT : make ci-msvc
385
385
<< : *job-windows-8c
386
386
387
- - image : x86_64-msvc-ext
387
+ # x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
388
+ - image : x86_64-msvc-ext1
388
389
env :
389
- 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
390
- HOST_TARGET : x86_64-pc-windows-msvc
391
- RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
392
- DEPLOY_TOOLSTATES_JSON : toolstates-windows.json
393
- << : *job-windows-8c
390
+ SCRIPT : python x.py --stage 2 test src/tools/cargotest src/tools/cargo
391
+ RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-lld
392
+ << : *job-windows
394
393
395
394
# Temporary builder to workaround CI issues
396
395
# See <https://github.com/rust-lang/rust/issues/127883>
@@ -406,6 +405,15 @@ auto:
406
405
RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-lld
407
406
<< : *job-windows
408
407
408
+ # Run `checktools.sh` and upload the toolstate file.
409
+ - image : x86_64-msvc-ext3
410
+ env :
411
+ SCRIPT : src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
412
+ HOST_TARGET : x86_64-pc-windows-msvc
413
+ RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
414
+ DEPLOY_TOOLSTATES_JSON : toolstates-windows.json
415
+ << : *job-windows
416
+
409
417
# 32/64-bit MinGW builds.
410
418
#
411
419
# We are using MinGW with POSIX threads since LLVM requires
You can’t perform that action at this time.
0 commit comments