Skip to content

Commit 70148b7

Browse files
committed
chore(ci): Update from Windows 2019 to Windows 2025
The Windows 2019 runner has been deprecated: https://redirect.github.com/actions/runner-images/issues/12045 This also installs Inno Setup manually, because it's not included in the Windows 2025 image.
1 parent 7cd90f9 commit 70148b7

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

.github/workflows/windows.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
include:
17-
- os: windows-2019
17+
- os: windows-2025
1818
qt-version: 6.4.3
1919
build-type: release
2020
outputs:
@@ -117,11 +117,11 @@ jobs:
117117
# XXX: Hack to work around this issue: https://github.com/actions/runner-images/issues/10819
118118
$env:VCToolsRedistDir = -join ($env:VCINSTALLDIR, "Redist\MSVC\", $env:VCToolsVersion, "\")
119119
}
120-
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC142.CRT\msvcp140.dll
121-
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC142.CRT\msvcp140_1.dll
122-
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC142.CRT\msvcp140_2.dll
123-
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC142.CRT\vcruntime140.dll
124-
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC142.CRT\vcruntime140_1.dll
120+
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC143.CRT\msvcp140.dll
121+
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC143.CRT\msvcp140_1.dll
122+
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC143.CRT\msvcp140_2.dll
123+
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC143.CRT\vcruntime140.dll
124+
Copy-Item $env:VCToolsRedistDir\x64\Microsoft.VC143.CRT\vcruntime140_1.dll
125125
} else {
126126
# On debug builds, the libraries above are included automatically, so we only need 'urtcbased.dll'.
127127
Copy-Item $env:WindowsSdkBinPath\x64\ucrt\ucrtbased.dll
@@ -137,7 +137,7 @@ jobs:
137137
installer:
138138
name: Installer
139139
needs: build-aqtinstall
140-
runs-on: windows-2019
140+
runs-on: windows-2025
141141
steps:
142142
- name: Checkout code to grab the ISS script
143143
uses: actions/checkout@v4
@@ -159,6 +159,12 @@ jobs:
159159
}
160160
Move-Item $x64_build Notes64
161161
162+
- name: Install latest Inno Setup
163+
run: |
164+
winget install --id JRSoftware.InnoSetup --exact --silent --source winget
165+
# Add to PATH
166+
Add-Content $env:GITHUB_PATH "$env:LOCALAPPDATA\Programs\Inno Setup 6"
167+
162168
- name: Create installer
163169
run: |
164170
Set-Location artifacts

0 commit comments

Comments
 (0)