Skip to content

Commit

Permalink
Auto merge of #124562 - dpaoliello:mingwserver2022, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed May 4, 2024
2 parents 9fa862f + bc294b8 commit 6d721dd
Showing 1 changed file with 16 additions and 8 deletions.
24 changes: 16 additions & 8 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,18 @@ runners:
<<: *base-job

- &job-windows-8c
os: windows-2019-8core-32gb
os: windows-2022-8core-32gb
<<: *base-job

- &job-windows-16c
os: windows-2022-16core-64gb
<<: *base-job

- &job-windows-2019-8c
os: windows-2019-8core-32gb
<<: *base-job

- &job-windows-2019-16c
os: windows-2019-16core-64gb
<<: *base-job

Expand Down Expand Up @@ -341,21 +349,21 @@ auto:
env:
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
SCRIPT: make ci-msvc
<<: *job-windows-8c
<<: *job-windows-2019-8c

- image: i686-msvc
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
SCRIPT: make ci-msvc
<<: *job-windows-8c
<<: *job-windows-2019-8c

- image: x86_64-msvc-ext
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
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-8c
<<: *job-windows-2019-8c

# 32/64-bit MinGW builds.
#
Expand Down Expand Up @@ -406,7 +414,7 @@ auto:
--set rust.codegen-units=1
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
DIST_REQUIRE_ALL_TOOLS: 1
<<: *job-windows-8c
<<: *job-windows-2019-8c

- image: dist-i686-msvc
env:
Expand All @@ -418,7 +426,7 @@ auto:
--enable-profiler
SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1
<<: *job-windows-8c
<<: *job-windows-2019-8c

- image: dist-aarch64-msvc
env:
Expand All @@ -429,7 +437,7 @@ auto:
--enable-profiler
SCRIPT: python x.py dist bootstrap --include-default-paths
DIST_REQUIRE_ALL_TOOLS: 1
<<: *job-windows-8c
<<: *job-windows-2019-8c

- image: dist-i686-mingw
env:
Expand Down Expand Up @@ -463,4 +471,4 @@ auto:
env:
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler
SCRIPT: python x.py dist bootstrap --include-default-paths
<<: *job-windows-8c
<<: *job-windows-2019-8c

0 comments on commit 6d721dd

Please sign in to comment.