Skip to content

Commit e120ed6

Browse files
committed
try fix vs studio
1 parent 4d93ac8 commit e120ed6

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/build-windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
id: toolchain-check
103103
run: |
104104
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 }}
106106
if [ $? -eq 0 ]; then
107107
echo "Toolchain is already installed"
108108
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
@@ -114,8 +114,8 @@ jobs:
114114
- name: 'Install toolchain and dependencies'
115115
run: |
116116
# 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' \
119119
--add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
120120
if: steps.toolchain-check.outputs.toolchain-installed != 'true'
121121

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ jobs:
310310
uses: ./.github/workflows/build-windows.yml
311311
with:
312312
platform: windows-x64
313-
msvc-toolset-version: '14.29'
313+
msvc-toolset-version: '17.13'
314314
msvc-toolset-architecture: 'x86.x64'
315315
configure-arguments: ${{ github.event.inputs.configure-arguments }}
316316
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -322,7 +322,7 @@ jobs:
322322
uses: ./.github/workflows/build-windows.yml
323323
with:
324324
platform: windows-aarch64
325-
msvc-toolset-version: '14.29'
325+
msvc-toolset-version: '17.13'
326326
msvc-toolset-architecture: 'arm64'
327327
make-target: 'hotspot'
328328
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'

0 commit comments

Comments
 (0)