Skip to content

Commit c9c954d

Browse files
committed
CI: build and test on JDK 24-ea
- java hints job remains on 23 and has to wait for nb-javac 24 - bump CV tests from JDK 22 to 23 - minor cleanup
1 parent 7a33387 commit c9c954d

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

.github/workflows/main.yml

+11-18
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
timeout-minutes: 40
125125
strategy:
126126
matrix:
127-
java: [ '17', '21', '23' ]
127+
java: [ '17', '21', '24-ea' ]
128128
exclude:
129129
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
130130
fail-fast: false
@@ -229,7 +229,7 @@ jobs:
229229
java: [ 17 ]
230230
include:
231231
- os: ubuntu-latest
232-
java: 22
232+
java: 23
233233
fail-fast: false
234234
steps:
235235

@@ -416,30 +416,23 @@ jobs:
416416
- name: Build nbms
417417
run: ant $OPTS build-nbms
418418

419+
# runs only in PRs if requested; ~18 min
420+
- name: Build all Tests
421+
if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()
422+
run: ant -quiet -Dcluster.config=$CLUSTER_CONFIG test -Dtest.includes=NoTestsJustBuild
423+
419424
# 13-14 min for javadoc; JDK version must be synced with nb-javac
420-
- name: Set up JDK 23 for javadoc
425+
- name: Set up JDK 24-ea for javadoc
421426
if: env.test_javadoc == 'true' && success()
422427
uses: actions/setup-java@v4
423428
with:
424-
java-version: 23
429+
java-version: 24-ea
425430
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
426431

427432
- name: Build javadoc
428433
if: env.test_javadoc == 'true' && success()
429434
run: ant $OPTS build-javadoc
430435

431-
- name: Set up JDK ${{ matrix.java }}
432-
if: env.test_javadoc == 'true' && success()
433-
uses: actions/setup-java@v4
434-
with:
435-
java-version: ${{ matrix.java }}
436-
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
437-
438-
# runs only in PRs if requested; ~18 min
439-
- name: Build all Tests
440-
if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()
441-
run: ant -quiet -Dcluster.config=$CLUSTER_CONFIG test -Dtest.includes=NoTestsJustBuild
442-
443436
- name: Create Test Summary
444437
uses: test-summary/action@v2
445438
if: failure()
@@ -834,7 +827,7 @@ jobs:
834827
timeout-minutes: 50
835828
strategy:
836829
matrix:
837-
java: [ '17', '21', '23' ]
830+
java: [ '17', '21', '24-ea' ]
838831
exclude:
839832
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
840833
fail-fast: false
@@ -1494,7 +1487,7 @@ jobs:
14941487
timeout-minutes: 60
14951488
strategy:
14961489
matrix:
1497-
java: [ '17', '21', '23' ]
1490+
java: [ '17', '21', '24-ea' ]
14981491
exclude:
14991492
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
15001493
fail-fast: false

ide/ide.kit/nbproject/project.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,5 @@ test.jms.flags=\
5050
--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED \
5151
--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED \
5252
--add-opens=java.desktop/sun.awt=ALL-UNNAMED \
53-
--add-modules=jdk.jdwp.agent,jdk.attach,jdk.jdi,jdk.jshell,java.compiler,jdk.compiler,jdk.management,jdk.unsupported,jdk.internal.le,jdk.internal.ed,jdk.internal.opt,jdk.internal.jvmstat \
53+
--add-modules=java.compiler \
5454
--add-exports=jdk.jdi/com.sun.jdi=ALL-UNNAMED

platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/StatFilesTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public void testLockFile() throws IOException {
163163
expectedCount++;
164164
// sun.awt.PlatformGraphicsInfo.getDefaultHeadlessProperty probes a .so or .dylib
165165
// Runtime.version().feature() > 18
166-
if (Integer.parseInt(System.getProperty("java.version").split("\\.")[0]) > 18) {
166+
if (Integer.parseInt(System.getProperty("java.version").split("\\.")[0].split("-")[0]) > 18) {
167167
expectedCount++;
168168
}
169169
}

0 commit comments

Comments
 (0)