File tree Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Expand file tree Collapse file tree 2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -102,7 +102,7 @@ jobs:
102
102
id : toolchain-check
103
103
run : |
104
104
set +e
105
- '/c/Program Files (x86) /Microsoft Visual Studio/2019 /Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
105
+ '/c/Program Files/Microsoft Visual Studio/2022 /Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
106
106
if [ $? -eq 0 ]; then
107
107
echo "Toolchain is already installed"
108
108
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -114,8 +114,8 @@ jobs:
114
114
- name : ' Install toolchain and dependencies'
115
115
run : |
116
116
# Run Visual Studio Installer
117
- '/c/Program Files (x86) /Microsoft Visual Studio/Installer/vs_installer.exe' \
118
- modify --quiet --installPath 'C:\Program Files (x86) \Microsoft Visual Studio\2019 \Enterprise' \
117
+ '/c/Program Files/Microsoft Visual Studio/Installer/vs_installer.exe' \
118
+ modify --quiet --installPath 'C:\Program Files\Microsoft Visual Studio\2022 \Enterprise' \
119
119
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
120
120
if : steps.toolchain-check.outputs.toolchain-installed != 'true'
121
121
Original file line number Diff line number Diff line change @@ -310,7 +310,7 @@ jobs:
310
310
uses : ./.github/workflows/build-windows.yml
311
311
with :
312
312
platform : windows-x64
313
- msvc-toolset-version : ' 14.29 '
313
+ msvc-toolset-version : ' 17.13 '
314
314
msvc-toolset-architecture : ' x86.x64'
315
315
configure-arguments : ${{ github.event.inputs.configure-arguments }}
316
316
make-arguments : ${{ github.event.inputs.make-arguments }}
@@ -322,7 +322,7 @@ jobs:
322
322
uses : ./.github/workflows/build-windows.yml
323
323
with :
324
324
platform : windows-aarch64
325
- msvc-toolset-version : ' 14.29 '
325
+ msvc-toolset-version : ' 17.13 '
326
326
msvc-toolset-architecture : ' arm64'
327
327
make-target : ' hotspot'
328
328
extra-conf-options : ' --openjdk-target=aarch64-unknown-cygwin'
You can’t perform that action at this time.
0 commit comments