From f569c2e63b94dbf852e116baf4ebfc1d8b5a7570 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Fri, 21 Mar 2025 08:33:19 -0700
Subject: [PATCH 1/3] Update / fix check-ci.yml

---
 .github/env/Linux/gradle.properties |  4 ----
 .github/workflows/check-ci.yml      | 31 +++++++++++++++--------------
 2 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 .github/env/Linux/gradle.properties

diff --git a/.github/env/Linux/gradle.properties b/.github/env/Linux/gradle.properties
deleted file mode 100644
index 33ccecf..0000000
--- a/.github/env/Linux/gradle.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources
-org.gradle.parallel=true
-org.gradle.workers.max=2
-org.gradle.jvmargs=-Xmx6g
diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index e1af622..e279787 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -8,28 +8,29 @@ on:
 
 jobs:
   checks:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      # note: this uses Zulu and not AdoptOpenJDK or other. should make sure we build and test on the same one...
-      - name: Setup JDK
-        uses: actions/setup-java@v1
+      - name: Setup JDK 8
+        id: setup-java-8
+        uses: actions/setup-java@v4
         with:
-          java-version: '8.0.282'
+          java-version: '8'
+
+      - name: Setup JDK
+        id: setup-java
+        uses: actions/setup-java@v4
 
-      - name: Setup gradle properties
-        run: |
-          mkdir -p $HOME/.gradle
-          cp .github/env/${{ runner.os }}/gradle.properties $HOME/.gradle/gradle.properties
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Set JAVA_HOME
+        run: echo "JAVA_HOME=${{ steps.setup-java.outputs.path }}" >> $GITHUB_ENV
 
       - name: Check
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: checks
-          arguments: check
-          gradle-version: wrapper
+        run: ./gradlew --continue check
 
       - name: Publish Test Results
         uses: scacap/action-surefire-report@v1

From c757888b7c43b8f5aa13e8b28ef144b919e31ccd Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Fri, 21 Mar 2025 08:34:33 -0700
Subject: [PATCH 2/3] set temurin

---
 .github/workflows/check-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index e279787..3a4cd3a 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -17,6 +17,7 @@ jobs:
         id: setup-java-8
         uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: '8'
 
       - name: Setup JDK

From 5fffc1b47ed07333d55424909252310a64fda236 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Fri, 21 Mar 2025 08:38:05 -0700
Subject: [PATCH 3/3] try again

---
 .github/workflows/check-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index 3a4cd3a..6b82dd5 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -21,14 +21,17 @@ jobs:
           java-version: '8'
 
       - name: Setup JDK
-        id: setup-java
+        id: setup-java-21
         uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
 
       - name: Set JAVA_HOME
-        run: echo "JAVA_HOME=${{ steps.setup-java.outputs.path }}" >> $GITHUB_ENV
+        run: echo "JAVA_HOME=${{ steps.setup-java-21.outputs.path }}" >> $GITHUB_ENV
 
       - name: Check
         run: ./gradlew --continue check