Skip to content

CI: build and start testing on JDK 24-ea #7974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbien merged 1 commit into from
Nov 22, 2024
Merged

CI: build and start testing on JDK 24-ea #7974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ jobs:
timeout-minutes: 40
strategy:
matrix:
java: [ '17', '21', '23' ]
java: [ '17', '21', '24-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down Expand Up @@ -229,7 +229,7 @@ jobs:
java: [ 17 ]
include:
- os: ubuntu-latest
java: 22
java: 23
fail-fast: false
steps:

Expand Down Expand Up @@ -416,30 +416,23 @@ jobs:
- name: Build nbms
run: ant $OPTS build-nbms

# runs only in PRs if requested; ~18 min
- name: Build all Tests
if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()
run: ant -quiet -Dcluster.config=$CLUSTER_CONFIG test -Dtest.includes=NoTestsJustBuild

# 13-14 min for javadoc; JDK version must be synced with nb-javac
- name: Set up JDK 23 for javadoc
- name: Set up JDK 24-ea for javadoc
if: env.test_javadoc == 'true' && success()
uses: actions/setup-java@v4
with:
java-version: 23
java-version: 24-ea
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}

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

- name: Set up JDK ${{ matrix.java }}
if: env.test_javadoc == 'true' && success()
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}

# runs only in PRs if requested; ~18 min
- name: Build all Tests
if: env.test_tests == 'true' && github.event_name == 'pull_request' && success()
run: ant -quiet -Dcluster.config=$CLUSTER_CONFIG test -Dtest.includes=NoTestsJustBuild

- name: Create Test Summary
uses: test-summary/action@v2
if: failure()
Expand Down Expand Up @@ -834,7 +827,7 @@ jobs:
timeout-minutes: 50
strategy:
matrix:
java: [ '17', '21', '23' ]
java: [ '17', '21', '24-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down Expand Up @@ -1494,7 +1487,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
java: [ '17', '21', '23' ]
java: [ '17', '21', '24-ea' ]
exclude:
- java: ${{ github.event_name == 'pull_request' && 'nothing' || '21' }}
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion ide/ide.kit/nbproject/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,5 @@ test.jms.flags=\
--add-opens=java.desktop/javax.swing.plaf.synth=ALL-UNNAMED \
--add-opens=java.desktop/javax.swing.text=ALL-UNNAMED \
--add-opens=java.desktop/sun.awt=ALL-UNNAMED \
--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 \
--add-modules=java.compiler \
Copy link
Member Author

@mbien mbien Nov 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is for CV tests on 23: JDK 23 added jdk.internal.md which we would have to add to the list. This would prevent the JVM from starting on JDKs <22 however.

Adding only java.compiler seems to work, since according to the doc:

--add-modules <module name>[,<module name>...]
                  root modules to resolve in addition to the initial module.

this seems to add all transitive deps automatically.

--add-exports=jdk.jdi/com.sun.jdi=ALL-UNNAMED
2 changes: 1 addition & 1 deletion ...fs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/StatFilesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public void testLockFile() throws IOException {
expectedCount++;
// sun.awt.PlatformGraphicsInfo.getDefaultHeadlessProperty probes a .so or .dylib
// Runtime.version().feature() > 18
if (Integer.parseInt(System.getProperty("java.version").split("\\.")[0]) > 18) {
if (Integer.parseInt(System.getProperty("java.version").split("\\.")[0].split("-")[0]) > 18) {
expectedCount++;
}
}
Expand Down