Skip to content

Commit 6d721dd

Browse files
committed
Auto merge of #124562 - dpaoliello:mingwserver2022, r=Mark-Simulacrum
Use Server 2022 in CI for mingw jobs From my [previous testing](#92948 (comment)), there is nothing blocking using Server 2022 for the Windows MinGW jobs. This change: * Adds new `os` entries for Server 2022. * Renamed the Server 2019 `os` entries (as we'll be removing these over time). * Moves the mingw jobs to Server 2022 and leaves the msvc jobs on Server 2019. Partially fixes #92948
2 parents 9fa862f + bc294b8 commit 6d721dd

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

@@ -341,21 +349,21 @@ auto:
341349
env:
342350
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
343351
SCRIPT: make ci-msvc
344-
<<: *job-windows-8c
352+
<<: *job-windows-2019-8c
345353

346354
- image: i686-msvc
347355
env:
348356
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
349357
SCRIPT: make ci-msvc
350-
<<: *job-windows-8c
358+
<<: *job-windows-2019-8c
351359

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

360368
# 32/64-bit MinGW builds.
361369
#
@@ -406,7 +414,7 @@ auto:
406414
--set rust.codegen-units=1
407415
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
408416
DIST_REQUIRE_ALL_TOOLS: 1
409-
<<: *job-windows-8c
417+
<<: *job-windows-2019-8c
410418

411419
- image: dist-i686-msvc
412420
env:
@@ -418,7 +426,7 @@ auto:
418426
--enable-profiler
419427
SCRIPT: python x.py dist bootstrap --include-default-paths
420428
DIST_REQUIRE_ALL_TOOLS: 1
421-
<<: *job-windows-8c
429+
<<: *job-windows-2019-8c
422430

423431
- image: dist-aarch64-msvc
424432
env:
@@ -429,7 +437,7 @@ auto:
429437
--enable-profiler
430438
SCRIPT: python x.py dist bootstrap --include-default-paths
431439
DIST_REQUIRE_ALL_TOOLS: 1
432-
<<: *job-windows-8c
440+
<<: *job-windows-2019-8c
433441

434442
- image: dist-i686-mingw
435443
env:
@@ -463,4 +471,4 @@ auto:
463471
env:
464472
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
465473
SCRIPT: python x.py dist bootstrap --include-default-paths
466-
<<: *job-windows-8c
474+
<<: *job-windows-2019-8c

0 commit comments

Comments
 (0)