Merge remote-tracking branch 'upstream/main' into setup-gradle-action

deephaven · Oct 28, 2024 · 59b8e30 · 59b8e30
2 parents 8792961 + 603c219
commit 59b8e30
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -50,14 +50,22 @@ jobs:
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
+      - name: Setup JDK 23
+        id: setup-java-23
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '23'
+          cache: 'gradle'
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-21.outputs.path }}" >> $GITHUB_ENV
 
       - name: Setup gradle properties
         run: |
           cat .github/env/${{ runner.os }}/gradle.properties >> gradle.properties
           echo >> gradle.properties
-          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }},${{ steps.setup-java-17.outputs.path }},${{ steps.setup-java-21.outputs.path }}" >> gradle.properties
+          echo "org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }},${{ steps.setup-java-17.outputs.path }},${{ steps.setup-java-21.outputs.path }},${{ steps.setup-java-23.outputs.path }}" >> gradle.properties
           echo "customDoubleParser=${{ matrix.customDoubleParser }}" >> gradle.properties
           cat gradle.properties
 

diff --git a/buildSrc/src/main/groovy/io/deephaven/csv/Constants.groovy b/buildSrc/src/main/groovy/io/deephaven/csv/Constants.groovy
@@ -3,5 +3,5 @@ package io.deephaven.csv
 class Constants {
     public static int LATEST_LTS = 21
 
-    public static int[] TEST_VERSIONS = [8, 11, 17, 21]
+    public static int[] TEST_VERSIONS = [8, 11, 17, 21, 23]
 }