1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8358538: Update GHA Windows runner to 2025

Browse Source 
Reviewed-by: shade
This commit is contained in:
Magnus Ihse Bursie 2025-06-04 23:19:33 +00:00
parent 5b27e9c2df
commit b787ff6def
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-windows.yml vendored
View File

@ -63,7 +63,7 @@ env:
jobs: jobs:
build-windows: build-windows:
name: build name: build
runs-on: windows-2019 runs-on: windows-2025
defaults: defaults:
run: run:
shell: bash shell: bash
@ -102,7 +102,7 @@ jobs:
id: toolchain-check id: toolchain-check
run: | run: |
set +e set +e
'/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }} '/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Toolchain is already installed" echo "Toolchain is already installed"
echo "toolchain-installed=true" >> $GITHUB_OUTPUT echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@ -115,7 +115,7 @@ jobs:
run: | run: |
# Run Visual Studio Installer # Run Visual Studio Installer
'/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \ '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \ modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise' \
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }} --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
if: steps.toolchain-check.outputs.toolchain-installed != 'true' if: steps.toolchain-check.outputs.toolchain-installed != 'true'

6
.github/workflows/main.yml vendored
View File

@ -310,7 +310,7 @@ jobs:
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
with: with:
platform: windows-x64 platform: windows-x64
msvc-toolset-version: '14.29' msvc-toolset-version: '14.43'
msvc-toolset-architecture: 'x86.x64' msvc-toolset-architecture: 'x86.x64'
configure-arguments: ${{ github.event.inputs.configure-arguments }} configure-arguments: ${{ github.event.inputs.configure-arguments }}
make-arguments: ${{ github.event.inputs.make-arguments }} make-arguments: ${{ github.event.inputs.make-arguments }}
@ -322,7 +322,7 @@ jobs:
uses: ./.github/workflows/build-windows.yml uses: ./.github/workflows/build-windows.yml
with: with:
platform: windows-aarch64 platform: windows-aarch64
msvc-toolset-version: '14.29' msvc-toolset-version: '14.43'
msvc-toolset-architecture: 'arm64' msvc-toolset-architecture: 'arm64'
make-target: 'hotspot' make-target: 'hotspot'
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin' extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
@ -393,5 +393,5 @@ jobs:
with: with:
platform: windows-x64 platform: windows-x64
bootjdk-platform: windows-x64 bootjdk-platform: windows-x64
runs-on: windows-2019 runs-on: windows-2025
debug-suffix: -debug debug-suffix: -debug