Skip to content

Commit

Permalink
chore: Bump to Java 23 in nightly testing (#6145)
Browse files Browse the repository at this point in the history
This also plans out some environment variables for future releases of
the JDK.

See https://jdk.java.net/23/release-notes
  • Loading branch information
devinrsmith authored Sep 27, 2024
1 parent d6bee30 commit d06d3e2
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/gradle-properties.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_20_X64:+$JAVA_HOME_20_X64,}
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_21_X64:+$JAVA_HOME_21_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_22_X64:+$JAVA_HOME_22_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_23_X64:+$JAVA_HOME_23_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_24_X64:+$JAVA_HOME_24_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_25_X64:+$JAVA_HOME_25_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_26_X64:+$JAVA_HOME_26_X64,}"
JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_27_X64:+$JAVA_HOME_27_X64,}"

# Our CI JDKs should be pre-provisioned and invoked correctly,
# we shouldn't rely on gradle for any of this logic.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/nightly-check-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
fail-fast: false
matrix:
gradle-task: ['check', 'testSerial', 'testParallel', 'testOutOfBand']
test-jvm-version: ['11', '17', '21', '22']
test-jvm-version: ['11', '17', '21', '23']
if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
runs-on: ubuntu-22.04
concurrency:
Expand Down Expand Up @@ -48,12 +48,12 @@ jobs:
distribution: 'temurin'
java-version: '21'

- name: Setup JDK 22
id: setup-java-22
- name: Setup JDK 23
id: setup-java-23
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '22'
java-version: '23'

- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ public void testShowHistory() {
+
"java.base/java.lang.reflect.Method.invoke(Method.java:580)\n",
history.get(0).fileName);
} else if ("22".equals(javaVersion)) {
} else if ("23".equals(javaVersion)) {
assertEquals(
"<not from configuration file>: io.deephaven.configuration.TestConfiguration.testShowHistory(TestConfiguration.java:428)\n"
+
Expand Down

0 comments on commit d06d3e2

Please sign in to comment.