Skip to content

Commit 345b417

Browse files
committed
8338286: GHA: Demote x86_32 to hotspot build only
Backport-of: da7311bbe37c2b9632b117d52a77c659047820b7
1 parent ec5976d commit 345b417

File tree

1 file changed

+8
-18
lines changed

1 file changed

+8
-18
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ on:
3535
platforms:
3636
description: 'Platform(s) to execute on (comma separated, e.g. "linux-x64, macos, aarch64")'
3737
required: true
38-
default: 'linux-x64, linux-x86, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
38+
default: 'linux-x64, linux-x86-hs, linux-x64-variants, linux-cross-compile, macos-x64, macos-aarch64, windows-x64, windows-aarch64, docs'
3939
configure-arguments:
4040
description: 'Additional configure arguments'
4141
required: false
@@ -58,7 +58,7 @@ jobs:
5858
runs-on: ubuntu-22.04
5959
outputs:
6060
linux-x64: ${{ steps.include.outputs.linux-x64 }}
61-
linux-x86: ${{ steps.include.outputs.linux-x86 }}
61+
linux-x86-hs: ${{ steps.include.outputs.linux-x86-hs }}
6262
linux-x64-variants: ${{ steps.include.outputs.linux-x64-variants }}
6363
linux-cross-compile: ${{ steps.include.outputs.linux-cross-compile }}
6464
macos-x64: ${{ steps.include.outputs.macos-x64 }}
@@ -110,7 +110,7 @@ jobs:
110110
}
111111
112112
echo "linux-x64=$(check_platform linux-x64 linux x64)" >> $GITHUB_OUTPUT
113-
echo "linux-x86=$(check_platform linux-x86 linux x86)" >> $GITHUB_OUTPUT
113+
echo "linux-x86-hs=$(check_platform linux-x86-hs linux x86)" >> $GITHUB_OUTPUT
114114
echo "linux-x64-variants=$(check_platform linux-x64-variants variants)" >> $GITHUB_OUTPUT
115115
echo "linux-cross-compile=$(check_platform linux-cross-compile cross-compile)" >> $GITHUB_OUTPUT
116116
echo "macos-x64=$(check_platform macos-x64 macos x64)" >> $GITHUB_OUTPUT
@@ -134,12 +134,13 @@ jobs:
134134
make-arguments: ${{ github.event.inputs.make-arguments }}
135135
if: needs.select.outputs.linux-x64 == 'true'
136136

137-
build-linux-x86:
138-
name: linux-x86
137+
build-linux-x86-hs:
138+
name: linux-x86-hs
139139
needs: select
140140
uses: ./.github/workflows/build-linux.yml
141141
with:
142142
platform: linux-x86
143+
make-target: 'hotspot'
143144
gcc-major-version: '10'
144145
gcc-package-suffix: '-multilib'
145146
apt-architecture: 'i386'
@@ -149,7 +150,7 @@ jobs:
149150
extra-conf-options: '--with-target-bits=32'
150151
configure-arguments: ${{ github.event.inputs.configure-arguments }}
151152
make-arguments: ${{ github.event.inputs.make-arguments }}
152-
if: needs.select.outputs.linux-x86 == 'true'
153+
if: needs.select.outputs.linux-x86-hs == 'true'
153154

154155
build-linux-x64-hs-nopch:
155156
name: linux-x64-hs-nopch
@@ -299,16 +300,6 @@ jobs:
299300
bootjdk-platform: linux-x64
300301
runs-on: ubuntu-22.04
301302

302-
test-linux-x86:
303-
name: linux-x86
304-
needs:
305-
- build-linux-x86
306-
uses: ./.github/workflows/test.yml
307-
with:
308-
platform: linux-x86
309-
bootjdk-platform: linux-x64
310-
runs-on: ubuntu-22.04
311-
312303
test-macos-x64:
313304
name: macos-x64
314305
needs:
@@ -346,7 +337,7 @@ jobs:
346337
if: always()
347338
needs:
348339
- build-linux-x64
349-
- build-linux-x86
340+
- build-linux-x86-hs
350341
- build-linux-x64-hs-nopch
351342
- build-linux-x64-hs-zero
352343
- build-linux-x64-hs-minimal
@@ -357,7 +348,6 @@ jobs:
357348
- build-windows-x64
358349
- build-windows-aarch64
359350
- test-linux-x64
360-
- test-linux-x86
361351
- test-macos-x64
362352
- test-windows-x64
363353

0 commit comments

Comments
 (0)