Skip to content

Commit 1658c77

Browse files
[Misc] Fix windows build
Summary: as title Testing: CI Reviewers: Ann-1024, lusou-zhangquan Issue: #957
1 parent 7d2d5c5 commit 1658c77

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/actions/do-build/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ runs:
4242
- name: 'Build'
4343
id: build
4444
run: >
45-
make LOG=info ${{ inputs.make-target }}
45+
make -k LOG=info ${{ inputs.make-target }}
4646
|| bash ./.github/scripts/gen-build-failure-report.sh "$GITHUB_STEP_SUMMARY"
4747
shell: bash
4848

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
uses: ./.github/workflows/build-windows.yml
9898
with:
9999
platform: windows-x64
100-
msvc-toolset-version: '14.29'
100+
msvc-toolset-version: '14.44'
101101
msvc-toolset-architecture: 'x86.x64'
102102
configure-arguments: ${{ github.event.inputs.configure-arguments }}
103103
make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -150,7 +150,7 @@ jobs:
150150
with:
151151
platform: windows-x64
152152
bootjdk-platform: windows-x64
153-
runs-on: '"windows-2019"'
153+
runs-on: '"windows-2025"'
154154

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

0 commit comments

Comments
 (0)