Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ee813ac

Browse files
committedNov 21, 2024·
Auto merge of rust-lang#133248 - MarcoIeni:x86_64-msvc-ext-free, r=<try>
CI: use free runner in x86_64-msvc-ext try-job: x86_64-msvc-ext try-job: x86_64-msvc-ext3
2 parents 318f96a + 395a386 commit ee813ac

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed
 

‎src/ci/github-actions/jobs.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -386,11 +386,10 @@ auto:
386386

387387
- image: x86_64-msvc-ext
388388
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
389+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
390390
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
391+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
392+
<<: *job-windows
394393

395394
# Temporary builder to workaround CI issues
396395
# See <https://github.com/rust-lang/rust/issues/127883>
@@ -406,6 +405,14 @@ auto:
406405
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
407406
<<: *job-windows
408407

408+
- image: x86_64-msvc-ext3
409+
env:
410+
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
411+
HOST_TARGET: x86_64-pc-windows-msvc
412+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
413+
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
414+
<<: *job-windows
415+
409416
# 32/64-bit MinGW builds.
410417
#
411418
# We are using MinGW with POSIX threads since LLVM requires

0 commit comments

Comments
 (0)
Please sign in to comment.