Skip to content

Commit a22e804

Browse files
authored
fix: JDK8 version check, buildx matrix
1 parent 66ed2f7 commit a22e804

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.github/workflows/buildx.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
matrix:
1717
java-version: [8, 11, 17, 21]
1818
java-type: [jdk, jre]
19-
node-version: [18, 20, 22, 24, 26, 28]
19+
node-version: [18, 20, 22]
2020
variant: [default, alpine]
21-
platforms:
22-
- linux/amd64,linux/arm64,linux/ppc64le
2321
include:
22+
- variant: default
23+
platforms: linux/amd64,linux/arm64,linux/ppc64le
2424
- variant: alpine
2525
platforms: linux/amd64
2626
- java-version: 11

.github/workflows/dockerimage.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,16 @@ jobs:
3333
echo "$VERSIONS"
3434
3535
# Check Java version
36-
if ! echo "$VERSIONS" | grep -q "version \"${{ matrix.java-version }}"; then
37-
echo "::error::Expected Java ${{ matrix.java-version }} but got different version"
38-
exit 1
36+
if [ "${{ matrix.java-version }}" = "8" ]; then
37+
if ! echo "$VERSIONS" | grep -q "version \"1.8.0"; then
38+
echo "::error::Expected Java 8 but got different version"
39+
exit 1
40+
fi
41+
else
42+
if ! echo "$VERSIONS" | grep -q "version \"${{ matrix.java-version }}"; then
43+
echo "::error::Expected Java ${{ matrix.java-version }} but got different version"
44+
exit 1
45+
fi
3946
fi
4047
4148
# Check Node version

0 commit comments

Comments
 (0)