diff options
| author | bors <bors@rust-lang.org> | 2024-05-04 07:49:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-04 07:49:50 +0000 |
| commit | 6d721dd0b80ad5382d38481a2477f7404b73e717 (patch) | |
| tree | cc7a48b8ebbf6ed8e93f1f124a39f45c12439741 /src/ci | |
| parent | 9fa862ff29ccfea885f8b1f33f4a507d456ae551 (diff) | |
| parent | bc294b857ec03f487f79f93a621c552785a5bf29 (diff) | |
| download | rust-6d721dd0b80ad5382d38481a2477f7404b73e717.tar.gz rust-6d721dd0b80ad5382d38481a2477f7404b73e717.zip | |
Auto merge of #124562 - dpaoliello:mingwserver2022, r=Mark-Simulacrum
Use Server 2022 in CI for mingw jobs From my [previous testing](https://github.com/rust-lang/rust/issues/92948#issuecomment-2077771347), 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
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 42749f80653..20b1a55ffb8 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -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 @@ -341,13 +349,13 @@ 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: @@ -355,7 +363,7 @@ auto: 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. # @@ -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: @@ -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: @@ -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: @@ -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 |