File tree Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Expand file tree Collapse file tree 2 files changed +13
-4
lines changed Original file line number Diff line number Diff line change 31
31
platform :
32
32
required : true
33
33
type : string
34
+ runs-on :
35
+ required : true
36
+ type : string
34
37
extra-conf-options :
35
38
required : false
36
39
type : string
67
70
jobs :
68
71
build-windows :
69
72
name : build
70
- runs-on : windows-2025
73
+ runs-on : ${{ inputs.runs-on }}
71
74
defaults :
72
75
run :
73
76
shell : bash
92
95
id : bootjdk
93
96
uses : ./.github/actions/get-bootjdk
94
97
with :
95
- platform : windows-x64
98
+ platform : ${{ inputs.platform }}
96
99
97
100
- name : ' Get JTReg'
98
101
id : jtreg
@@ -106,7 +109,12 @@ jobs:
106
109
id : toolchain-check
107
110
run : |
108
111
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 }}
110
118
if [ $? -eq 0 ]; then
111
119
echo "Toolchain is already installed"
112
120
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
Original file line number Diff line number Diff line change @@ -366,7 +366,8 @@ jobs:
366
366
uses : ./.github/workflows/build-windows.yml
367
367
with :
368
368
platform : windows-aarch64
369
- msvc-toolset-version : ' 14.44'
369
+ runs-on : windows-11-arm
370
+ msvc-toolset-version : ' 14.43'
370
371
msvc-toolset-architecture : ' arm64'
371
372
make-target : ' hotspot'
372
373
extra-conf-options : ' --openjdk-target=aarch64-unknown-cygwin'
You can’t perform that action at this time.
0 commit comments