From d06d3e27553f1010116d34d55d4d74e60e3b97b6 Mon Sep 17 00:00:00 2001 From: Devin Smith Date: Fri, 27 Sep 2024 07:30:28 -0700 Subject: [PATCH] chore: Bump to Java 23 in nightly testing (#6145) This also plans out some environment variables for future releases of the JDK. See https://jdk.java.net/23/release-notes --- .github/scripts/gradle-properties.sh | 4 ++++ .github/workflows/nightly-check-ci.yml | 8 ++++---- .../io/deephaven/configuration/TestConfiguration.java | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/scripts/gradle-properties.sh b/.github/scripts/gradle-properties.sh index 88f00dce804..5a468670ef0 100755 --- a/.github/scripts/gradle-properties.sh +++ b/.github/scripts/gradle-properties.sh @@ -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. diff --git a/.github/workflows/nightly-check-ci.yml b/.github/workflows/nightly-check-ci.yml index 2e5c37cec73..b0f7ad91dc8 100644 --- a/.github/workflows/nightly-check-ci.yml +++ b/.github/workflows/nightly-check-ci.yml @@ -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: @@ -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 diff --git a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java index 925fca10d16..7f3069efcf6 100644 --- a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java +++ b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java @@ -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( ": io.deephaven.configuration.TestConfiguration.testShowHistory(TestConfiguration.java:428)\n" +