Skip to content

Commit 49e7ada

Browse files
committed
Add windows aarch64 build
1 parent f31b3a5 commit 49e7ada

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.github/workflows/build-windows.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ on:
3131
platform:
3232
required: true
3333
type: string
34+
runs-on:
35+
required: true
36+
type: string
3437
extra-conf-options:
3538
required: false
3639
type: string
@@ -63,7 +66,7 @@ env:
6366
jobs:
6467
build-windows:
6568
name: build
66-
runs-on: windows-2025
69+
runs-on: ${{ inputs.runs-on }}
6770
defaults:
6871
run:
6972
shell: bash
@@ -88,7 +91,7 @@ jobs:
8891
id: bootjdk
8992
uses: ./.github/actions/get-bootjdk
9093
with:
91-
platform: windows-x64
94+
platform: ${{ inputs.platform }}
9295

9396
- name: 'Get JTReg'
9497
id: jtreg
@@ -102,7 +105,12 @@ jobs:
102105
id: toolchain-check
103106
run: |
104107
set +e
105-
'/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
108+
if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then
109+
vcvars="vcvarsarm64.bat"
110+
else
111+
vcvars="vcvars64.bat"
112+
fi
113+
"/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/${vcvars}" -vcvars_ver=${{ inputs.msvc-toolset-version }}
106114
if [ $? -eq 0 ]; then
107115
echo "Toolchain is already installed"
108116
echo "toolchain-installed=true" >> $GITHUB_OUTPUT

.github/workflows/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ jobs:
310310
uses: ./.github/workflows/build-windows.yml
311311
with:
312312
platform: windows-x64
313+
runs-on: windows-2025
313314
msvc-toolset-version: '14.43'
314315
msvc-toolset-architecture: 'x86.x64'
315316
configure-arguments: ${{ github.event.inputs.configure-arguments }}
@@ -322,6 +323,7 @@ jobs:
322323
uses: ./.github/workflows/build-windows.yml
323324
with:
324325
platform: windows-aarch64
326+
runs-on: windows-11-arm
325327
msvc-toolset-version: '14.43'
326328
msvc-toolset-architecture: 'arm64'
327329
make-target: 'hotspot'

0 commit comments

Comments
 (0)