Skip to content

Commit 0927ca7

Browse files
committed
8358538: Update GHA Windows runner to 2025
8360042: GHA: Bump MSVC to 14.44 Reviewed-by: sgehwolf Backport-of: b787ff6def08a050b690b60e4a0ceb3aec2b73c8
1 parent cec1ef0 commit 0927ca7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/build-windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ env:
6363
jobs:
6464
build-windows:
6565
name: build
66-
runs-on: windows-2019
66+
runs-on: windows-2025
6767
defaults:
6868
run:
6969
shell: bash
@@ -98,7 +98,7 @@ jobs:
9898
id: toolchain-check
9999
run: |
100100
set +e
101-
'/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
101+
'/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
102102
if [ $? -eq 0 ]; then
103103
echo "Toolchain is already installed"
104104
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
# Run Visual Studio Installer
113113
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
114-
modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
114+
modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
115115
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
116116
if: steps.toolchain-check.outputs.toolchain-installed != 'true'
117117

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
uses: ./.github/workflows/build-windows.yml
247247
with:
248248
platform: windows-x64
249-
msvc-toolset-version: '14.29'
249+
msvc-toolset-version: '14.44'
250250
msvc-toolset-architecture: 'x86.x64'
251251
configure-arguments: ${{ github.event.inputs.configure-arguments }}
252252
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -258,7 +258,7 @@ jobs:
258258
uses: ./.github/workflows/build-windows.yml
259259
with:
260260
platform: windows-aarch64
261-
msvc-toolset-version: '14.29'
261+
msvc-toolset-version: '14.44'
262262
msvc-toolset-architecture: 'arm64'
263263
make-target: 'hotspot'
264264
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@@ -308,7 +308,7 @@ jobs:
308308
with:
309309
platform: windows-x64
310310
bootjdk-platform: windows-x64
311-
runs-on: windows-2019
311+
runs-on: windows-2025
312312

313313
# Remove bundles so they are not misconstrued as binary distributions from the JDK project
314314
remove-bundles:

0 commit comments

Comments
 (0)