Skip to content

Commit 6a963dd

Browse files
authored
Unrolled build for #141861
Rollup merge of #141861 - jieyouxu:windows-server-2025-20250527, r=Kobzol Switch `x86_64-msvc-{1,2}` back to Windows Server 2025 images New Windows Server 2025 images have been released (**20250527.1.0**). New images appear to not exhibit the lack-of-disk-space problem as tracked by #141022, and the new runner image's storage capacity appears to be configured correctly. Windows Server 2025 image version **20250527.1.0** release notes: <https://github.com/actions/runner-images/releases/tag/win25%2F20250527.1>. Resolves #141022.
2 parents aae43c4 + 861ee47 commit 6a963dd

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ runners:
3030
os: windows-2022
3131
<<: *base-job
3232

33-
# FIXME(#141022): Windows Server 2025 20250504.1.0 currently experiences
34-
# insufficient disk space.
3533
- &job-windows-25
3634
os: windows-2025
3735
<<: *base-job
@@ -497,17 +495,13 @@ auto:
497495
env:
498496
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-sanitizers --enable-profiler
499497
SCRIPT: make ci-msvc-py
500-
# FIXME(#141022): Windows Server 2025 20250504.1.0 currently experiences
501-
# insufficient disk space.
502-
<<: *job-windows
498+
<<: *job-windows-25
503499

504500
- name: x86_64-msvc-2
505501
env:
506502
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-sanitizers --enable-profiler
507503
SCRIPT: make ci-msvc-ps1
508-
# FIXME(#141022): Windows Server 2025 20250504.1.0 currently experiences
509-
# insufficient disk space.
510-
<<: *job-windows
504+
<<: *job-windows-25
511505

512506
# i686-msvc is split into two jobs to run tests in parallel.
513507
- name: i686-msvc-1

0 commit comments

Comments
 (0)