File tree Expand file tree Collapse file tree 2 files changed +13
-3
lines changed Expand file tree Collapse file tree 2 files changed +13
-3
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
63
66
jobs :
64
67
build-windows :
65
68
name : build
66
- runs-on : windows-2025
69
+ runs-on : ${{ inputs.runs-on }}
67
70
defaults :
68
71
run :
69
72
shell : bash
88
91
id : bootjdk
89
92
uses : ./.github/actions/get-bootjdk
90
93
with :
91
- platform : windows-x64
94
+ platform : ${{ inputs.platform }}
92
95
93
96
- name : ' Get JTReg'
94
97
id : jtreg
@@ -102,7 +105,12 @@ jobs:
102
105
id : toolchain-check
103
106
run : |
104
107
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 }}
106
114
if [ $? -eq 0 ]; then
107
115
echo "Toolchain is already installed"
108
116
echo "toolchain-installed=true" >> $GITHUB_OUTPUT
Original file line number Diff line number Diff line change @@ -310,6 +310,7 @@ jobs:
310
310
uses : ./.github/workflows/build-windows.yml
311
311
with :
312
312
platform : windows-x64
313
+ runs-on : windows-2025
313
314
msvc-toolset-version : ' 14.43'
314
315
msvc-toolset-architecture : ' x86.x64'
315
316
configure-arguments : ${{ github.event.inputs.configure-arguments }}
@@ -322,6 +323,7 @@ jobs:
322
323
uses : ./.github/workflows/build-windows.yml
323
324
with :
324
325
platform : windows-aarch64
326
+ runs-on : windows-11-arm
325
327
msvc-toolset-version : ' 14.43'
326
328
msvc-toolset-architecture : ' arm64'
327
329
make-target : ' hotspot'
You can’t perform that action at this time.
0 commit comments