Skip to content

Commit 5f8c1a5

Browse files
committed
Add windows aarch64 build
1 parent 14183f6 commit 5f8c1a5

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
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
@@ -67,7 +70,7 @@ env:
6770
jobs:
6871
build-windows:
6972
name: build
70-
runs-on: windows-2025
73+
runs-on: ${{ inputs.runs-on }}
7174
defaults:
7275
run:
7376
shell: bash
@@ -92,7 +95,7 @@ jobs:
9295
id: bootjdk
9396
uses: ./.github/actions/get-bootjdk
9497
with:
95-
platform: windows-x64
98+
platform: ${{ inputs.platform }}
9699

97100
- name: 'Get JTReg'
98101
id: jtreg
@@ -106,7 +109,12 @@ jobs:
106109
id: toolchain-check
107110
run: |
108111
set +e
109-
'/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvars64.bat' -vcvars_ver=${{ inputs.msvc-toolset-version }}
112+
if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then
113+
vcvars="vcvarsarm64.bat"
114+
else
115+
vcvars="vcvars64.bat"
116+
fi
117+
"/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/${vcvars}" -vcvars_ver=${{ inputs.msvc-toolset-version }}
110118
if [ $? -eq 0 ]; then
111119
echo "Toolchain is already installed"
112120
echo "toolchain-installed=true" >> $GITHUB_OUTPUT

.github/workflows/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,8 @@ jobs:
366366
uses: ./.github/workflows/build-windows.yml
367367
with:
368368
platform: windows-aarch64
369-
msvc-toolset-version: '14.44'
369+
runs-on: windows-11-arm
370+
msvc-toolset-version: '14.43'
370371
msvc-toolset-architecture: 'arm64'
371372
make-target: 'hotspot'
372373
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'

0 commit comments

Comments
 (0)