Skip to content

Commit acb320f

Browse files
committed
ORC-2110: Enable Java 25 to build and test all
1 parent 760d3f3 commit acb320f

1 file changed

Lines changed: 5 additions & 14 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
java:
7777
- 17
7878
- 21
79+
- 25
7980
cxx:
8081
- clang++
8182
include:
@@ -85,8 +86,6 @@ jobs:
8586
- os: ubuntu-24.04-arm
8687
java: 17
8788
cxx: clang++
88-
- os: ubuntu-latest
89-
java: 25
9089
env:
9190
MAVEN_OPTS: -Xmx2g
9291
MAVEN_SKIP_RC: true
@@ -102,18 +101,10 @@ jobs:
102101
- name: "Test"
103102
run: |
104103
mkdir -p ~/.m2
105-
if [ "${{ matrix.java }}" = "25" ]; then
106-
cd java
107-
# JDK 25 Build
108-
./mvnw package -DskipTests
109-
# JDK 25 Test: shims, core, tools modules
110-
./mvnw package --pl tools --am
111-
else
112-
mkdir build
113-
cd build
114-
cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix openssl@1.1` ..
115-
make package test-out
116-
fi
104+
mkdir build
105+
cd build
106+
cmake -DANALYZE_JAVA=ON -DOPENSSL_ROOT_DIR=`brew --prefix openssl@1.1` ..
107+
make package test-out
117108
- name: Step on failure
118109
if: ${{ failure() }}
119110
run: |

0 commit comments

Comments
 (0)