Skip to content

Commit 760a260

Browse files
magicusmagicus
committed
8295213: Run GHA manually with user-specified make and configure arguments
Reviewed-by: shade
1 parent 8402260 commit 760a260

File tree

5 files changed

+60
-8
lines changed

5 files changed

+60
-8
lines changed

‎.github/workflows/build-cross-compile.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ on:
4040
extra-conf-options:
4141
required: false
4242
type: string
43+
configure-arguments:
44+
required: false
45+
type: string
46+
make-arguments:
47+
required: false
48+
type: string
4349

4450
jobs:
4551
build-cross-compile:
@@ -165,7 +171,7 @@ jobs:
165171
--with-jmod-compress=zip-1
166172
CC=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-gcc-${{ inputs.gcc-major-version }}
167173
CXX=${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}-g++-${{ inputs.gcc-major-version }}
168-
${{ inputs.extra-conf-options }} || (
174+
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
169175
echo "Dumping config.log:" &&
170176
cat config.log &&
171177
exit 1)
@@ -174,5 +180,5 @@ jobs:
174180
id: build
175181
uses: ./.github/actions/do-build
176182
with:
177-
make-target: 'hotspot'
183+
make-target: 'hotspot ${{ inputs.make-arguments }}'
178184
platform: linux-${{ matrix.target-cpu }}

‎.github/workflows/build-linux.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ on:
5858
apt-extra-packages:
5959
required: false
6060
type: string
61+
configure-arguments:
62+
required: false
63+
type: string
64+
make-arguments:
65+
required: false
66+
type: string
6167

6268
jobs:
6369
build-linux:
@@ -123,7 +129,7 @@ jobs:
123129
--enable-jtreg-failure-handler
124130
--with-zlib=system
125131
--with-jmod-compress=zip-1
126-
${{ inputs.extra-conf-options }} || (
132+
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
127133
echo "Dumping config.log:" &&
128134
cat config.log &&
129135
exit 1)
@@ -132,7 +138,7 @@ jobs:
132138
id: build
133139
uses: ./.github/actions/do-build
134140
with:
135-
make-target: '${{ inputs.make-target }}'
141+
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
136142
platform: ${{ inputs.platform }}
137143
debug-suffix: '${{ matrix.suffix }}'
138144

‎.github/workflows/build-macos.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@ on:
4545
xcode-toolset-version:
4646
required: true
4747
type: string
48+
configure-arguments:
49+
required: false
50+
type: string
51+
make-arguments:
52+
required: false
53+
type: string
4854

4955
jobs:
5056
build-macos:
@@ -98,7 +104,7 @@ jobs:
98104
--enable-jtreg-failure-handler
99105
--with-zlib=system
100106
--with-jmod-compress=zip-1
101-
${{ inputs.extra-conf-options }} || (
107+
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
102108
echo "Dumping config.log:" &&
103109
cat config.log &&
104110
exit 1)
@@ -107,7 +113,7 @@ jobs:
107113
id: build
108114
uses: ./.github/actions/do-build
109115
with:
110-
make-target: '${{ inputs.make-target }}'
116+
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
111117
platform: ${{ inputs.platform }}
112118
debug-suffix: '${{ matrix.suffix }}'
113119

‎.github/workflows/build-windows.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ on:
4848
msvc-toolset-architecture:
4949
required: true
5050
type: string
51+
configure-arguments:
52+
required: false
53+
type: string
54+
make-arguments:
55+
required: false
56+
type: string
5157

5258
env:
5359
# These are needed to make the MSYS2 bash work properly
@@ -111,7 +117,7 @@ jobs:
111117
--enable-jtreg-failure-handler
112118
--with-msvc-toolset-version=${{ inputs.msvc-toolset-version }}
113119
--with-jmod-compress=zip-1
114-
${{ inputs.extra-conf-options }} || (
120+
${{ inputs.extra-conf-options }} ${{ inputs.configure-arguments }} || (
115121
echo "Dumping config.log:" &&
116122
cat config.log &&
117123
exit 1)
@@ -124,7 +130,7 @@ jobs:
124130
id: build
125131
uses: ./.github/actions/do-build
126132
with:
127-
make-target: '${{ inputs.make-target }}'
133+
make-target: '${{ inputs.make-target }} ${{ inputs.make-arguments }}'
128134
platform: ${{ inputs.platform }}
129135
debug-suffix: '${{ matrix.suffix }}'
130136

‎.github/workflows/main.yml

+28
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ on:
3636
description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
3737
required: true
3838
default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64'
39+
configure-arguments:
40+
description: 'Additional configure arguments'
41+
required: false
42+
make-arguments:
43+
description: 'Additional make arguments'
44+
required: false
3945

4046
concurrency:
4147
group: ${{ github.workflow }}-${{ github.ref }}
@@ -125,6 +131,8 @@ jobs:
125131
platform: linux-x64
126132
gcc-major-version: '10'
127133
apt-gcc-version: '10.3.0-15ubuntu1'
134+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
135+
make-arguments: ${{ github.event.inputs.make-arguments }}
128136
# The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
129137
if: needs.select.outputs.linux-x64 == 'true' || needs.select.outputs.linux-cross-compile == 'true'
130138

@@ -142,6 +150,8 @@ jobs:
142150
# install their dependencies manually.
143151
apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386'
144152
extra-conf-options: '--with-target-bits=32'
153+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
154+
make-arguments: ${{ github.event.inputs.make-arguments }}
145155
if: needs.select.outputs.linux-x86 == 'true'
146156

147157
build-linux-x64-hs-nopch:
@@ -155,6 +165,8 @@ jobs:
155165
gcc-major-version: '10'
156166
apt-gcc-version: '10.3.0-15ubuntu1'
157167
extra-conf-options: '--disable-precompiled-headers'
168+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
169+
make-arguments: ${{ github.event.inputs.make-arguments }}
158170
if: needs.select.outputs.linux-x64-variants == 'true'
159171

160172
build-linux-x64-hs-zero:
@@ -168,6 +180,8 @@ jobs:
168180
gcc-major-version: '10'
169181
apt-gcc-version: '10.3.0-15ubuntu1'
170182
extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
183+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
184+
make-arguments: ${{ github.event.inputs.make-arguments }}
171185
if: needs.select.outputs.linux-x64-variants == 'true'
172186

173187
build-linux-x64-hs-minimal:
@@ -181,6 +195,8 @@ jobs:
181195
gcc-major-version: '10'
182196
apt-gcc-version: '10.3.0-15ubuntu1'
183197
extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
198+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
199+
make-arguments: ${{ github.event.inputs.make-arguments }}
184200
if: needs.select.outputs.linux-x64-variants == 'true'
185201

186202
build-linux-x64-hs-optimized:
@@ -195,6 +211,8 @@ jobs:
195211
gcc-major-version: '10'
196212
apt-gcc-version: '10.3.0-15ubuntu1'
197213
extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
214+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
215+
make-arguments: ${{ github.event.inputs.make-arguments }}
198216
if: needs.select.outputs.linux-x64-variants == 'true'
199217

200218
build-linux-cross-compile:
@@ -207,6 +225,8 @@ jobs:
207225
gcc-major-version: '10'
208226
apt-gcc-version: '10.3.0-15ubuntu1'
209227
apt-gcc-cross-version: '10.3.0-8ubuntu1cross1'
228+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
229+
make-arguments: ${{ github.event.inputs.make-arguments }}
210230
if: needs.select.outputs.linux-cross-compile == 'true'
211231

212232
build-macos-x64:
@@ -216,6 +236,8 @@ jobs:
216236
with:
217237
platform: macos-x64
218238
xcode-toolset-version: '11.7'
239+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
240+
make-arguments: ${{ github.event.inputs.make-arguments }}
219241
if: needs.select.outputs.macos-x64 == 'true'
220242

221243
build-macos-aarch64:
@@ -226,6 +248,8 @@ jobs:
226248
platform: macos-aarch64
227249
xcode-toolset-version: '12.4'
228250
extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
251+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
252+
make-arguments: ${{ github.event.inputs.make-arguments }}
229253
if: needs.select.outputs.macos-aarch64 == 'true'
230254

231255
build-windows-x64:
@@ -236,6 +260,8 @@ jobs:
236260
platform: windows-x64
237261
msvc-toolset-version: '14.29'
238262
msvc-toolset-architecture: 'x86.x64'
263+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
264+
make-arguments: ${{ github.event.inputs.make-arguments }}
239265
if: needs.select.outputs.windows-x64 == 'true'
240266

241267
build-windows-aarch64:
@@ -248,6 +274,8 @@ jobs:
248274
msvc-toolset-architecture: 'arm64'
249275
make-target: 'hotspot'
250276
extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
277+
configure-arguments: ${{ github.event.inputs.configure-arguments }}
278+
make-arguments: ${{ github.event.inputs.make-arguments }}
251279
if: needs.select.outputs.windows-aarch64 == 'true'
252280

253281
###

0 commit comments

Comments
 (0)