Skip to content

Commit 2072da8

Browse files
committed
Fix Java version for Spark 4.0 in check-license and check-style
Spark 4.0 requires Java 17, while Spark 3.x uses Java 8. Add matrix.java to select the correct Java version per Spark version.
1 parent fc81bf6 commit 2072da8

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

.github/workflows/check-license.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,21 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
spark: [ 3.3, 3.4, 3.5, 4.0 ]
35+
include:
36+
- spark: 3.3
37+
java: 8
38+
- spark: 3.4
39+
java: 8
40+
- spark: 3.5
41+
java: 8
42+
- spark: 4.0
43+
java: 17
3544
steps:
3645
- uses: actions/checkout@v4
3746
- uses: actions/setup-java@v4
3847
with:
3948
distribution: zulu
40-
java-version: 8
49+
java-version: ${{ matrix.java }}
4150
- run: >-
4251
./gradlew rat --no-daemon
4352
-Dspark_binary_version=${{ matrix.spark }}

.github/workflows/style.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,21 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
spark: [ 3.3, 3.4, 3.5, 4.0 ]
36+
include:
37+
- spark: 3.3
38+
java: 8
39+
- spark: 3.4
40+
java: 8
41+
- spark: 3.5
42+
java: 8
43+
- spark: 4.0
44+
java: 17
3645
steps:
3746
- uses: actions/checkout@v4
3847
- uses: actions/setup-java@v4
3948
with:
4049
distribution: zulu
41-
java-version: 8
50+
java-version: ${{ matrix.java }}
4251
cache: gradle
4352
- run: >-
4453
./gradlew spotlessCheck --no-daemon --refresh-dependencies

0 commit comments

Comments
 (0)