Skip to content

Commit bc294b8

Browse files
committed
Use Server 2022 in CI for mingw jobs
1 parent 20aa2d8 commit bc294b8

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

src/ci/github-actions/jobs.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,18 @@ runners:
2525
<<: *base-job
2626

2727
- &job-windows-8c
28-
os: windows-2019-8core-32gb
28+
os: windows-2022-8core-32gb
2929
<<: *base-job
3030

3131
- &job-windows-16c
32+
os: windows-2022-16core-64gb
33+
<<: *base-job
34+
35+
- &job-windows-2019-8c
36+
os: windows-2019-8core-32gb
37+
<<: *base-job
38+
39+
- &job-windows-2019-16c
3240
os: windows-2019-16core-64gb
3341
<<: *base-job
3442

@@ -338,21 +346,21 @@ auto:
338346
env:
339347
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
340348
SCRIPT: make ci-msvc
341-
<<: *job-windows-8c
349+
<<: *job-windows-2019-8c
342350

343351
- image: i686-msvc
344352
env:
345353
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
346354
SCRIPT: make ci-msvc
347-
<<: *job-windows-8c
355+
<<: *job-windows-2019-8c
348356

349357
- image: x86_64-msvc-ext
350358
env:
351359
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
352360
HOST_TARGET: x86_64-pc-windows-msvc
353361
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json
354362
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
355-
<<: *job-windows-8c
363+
<<: *job-windows-2019-8c
356364

357365
# 32/64-bit MinGW builds.
358366
#
@@ -403,7 +411,7 @@ auto:
403411
--set rust.codegen-units=1
404412
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
405413
DIST_REQUIRE_ALL_TOOLS: 1
406-
<<: *job-windows-8c
414+
<<: *job-windows-2019-8c
407415

408416
- image: dist-i686-msvc
409417
env:
@@ -415,7 +423,7 @@ auto:
415423
--enable-profiler
416424
SCRIPT: python x.py dist bootstrap --include-default-paths
417425
DIST_REQUIRE_ALL_TOOLS: 1
418-
<<: *job-windows-8c
426+
<<: *job-windows-2019-8c
419427

420428
- image: dist-aarch64-msvc
421429
env:
@@ -426,7 +434,7 @@ auto:
426434
--enable-profiler
427435
SCRIPT: python x.py dist bootstrap --include-default-paths
428436
DIST_REQUIRE_ALL_TOOLS: 1
429-
<<: *job-windows-8c
437+
<<: *job-windows-2019-8c
430438

431439
- image: dist-i686-mingw
432440
env:
@@ -460,4 +468,4 @@ auto:
460468
env:
461469
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
462470
SCRIPT: python x.py dist bootstrap --include-default-paths
463-
<<: *job-windows-8c
471+
<<: *job-windows-2019-8c

0 commit comments

Comments
 (0)