Skip to content

Commit 1cceff3

Browse files
authored
GHA: Bump windows-2022 jobs to windows-2025 (#4894)
1 parent fa09b02 commit 1cceff3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/actions/merge-windows/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ runs:
145145
shell: cmd
146146
run: |
147147
echo on
148+
choco install innosetup
148149
"C:\Program Files (x86)\Inno Setup 6\iscc" ^
149150
"/O%CD%\newArtifacts" ^
150151
"/DLDCVersion=%ARTIFACT_ID%" ^

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ jobs:
9393
with_pgo: true
9494

9595
- job_name: Windows x64
96-
os: windows-2022
96+
os: windows-2025
9797
arch: x64
9898
extra_cmake_flags: >-
9999
"-DD_COMPILER_FLAGS=-O -flto=full -defaultlib=phobos2-ldc-lto,druntime-ldc-lto"
100100
-DEXTRA_CXXFLAGS=-flto=full
101101
with_pgo: true
102102

103103
- job_name: Windows x86
104-
os: windows-2022
104+
os: windows-2025
105105
arch: x86
106106
# `RT_CFLAGS=-m32` needed to make 64-bit clang-cl output 32-bit code for druntime integration tests
107107
extra_cmake_flags: >-
@@ -314,7 +314,7 @@ jobs:
314314

315315
merge-windows:
316316
name: Windows multilib
317-
runs-on: windows-2022
317+
runs-on: windows-2025
318318
timeout-minutes: 30
319319
needs: build-native
320320
steps:

0 commit comments

Comments
 (0)