From b4736e16ec5a73332fb30ce9afa83c59710730c8 Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Mon, 5 Jan 2026 13:14:16 -0800
Subject: [PATCH] fix: Update java and gradle property setup

The workflow for setting up Java and Gradle properties was recently changed in deephaven-core, so we need to update the branch and edge workflows here in the same manner.

https://github.com/deephaven/deephaven-core/pull/7531
https://github.com/deephaven/deephaven-core/pull/7532
---
 .github/workflows/branch-ci.yml | 21 ++++++++++-----------
 .github/workflows/edge-ci.yml   | 23 +++++++++++------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml
index 2b85a07..8ee5c56 100644
--- a/.github/workflows/branch-ci.yml
+++ b/.github/workflows/branch-ci.yml
@@ -20,7 +20,7 @@ jobs:
       git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
     steps:
       - name: Checkout deephaven-core
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: deephaven/deephaven-core
           ref: ${{ github.event.inputs.deephaven_core_ref }}
@@ -29,23 +29,22 @@ jobs:
         id: get-git-revision
         run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
 
-      - name: Setup JDK 11
-        id: setup-java-11
-        uses: actions/setup-java@v4
+      - name: Setup JDKs
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '11'
-
-      - name: Set JAVA_HOME
-        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+          java-version: |
+            11
+            17
+            21
 
       - name: Setup gradle properties
         run: |
-          .github/scripts/gradle-properties.sh >> gradle.properties
+          .github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
           cat gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Assemble distribution
         run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -64,7 +63,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
diff --git a/.github/workflows/edge-ci.yml b/.github/workflows/edge-ci.yml
index de38186..5f33f1b 100644
--- a/.github/workflows/edge-ci.yml
+++ b/.github/workflows/edge-ci.yml
@@ -23,7 +23,7 @@ jobs:
       git-revision: ${{ steps.get-git-revision.outputs.GIT_REVISION }}
     steps:
       - name: Checkout deephaven-core
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: deephaven/deephaven-core
 
@@ -31,23 +31,22 @@ jobs:
         id: get-git-revision
         run: echo "GIT_REVISION="$(git rev-parse HEAD) >> $GITHUB_OUTPUT
 
-      - name: Setup JDK 11
-        id: setup-java-11
-        uses: actions/setup-java@v4
+      - name: Setup JDKs
+        uses: actions/setup-java@v5
         with:
-          distribution: "temurin"
-          java-version: "11"
-
-      - name: Set JAVA_HOME
-        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+          distribution: 'temurin'
+          java-version: |
+            11
+            17
+            21
 
       - name: Setup gradle properties
         run: |
-          .github/scripts/gradle-properties.sh >> gradle.properties
+          .github/scripts/gradle-properties.sh 11 17 21 >> gradle.properties
           cat gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@v5
 
       - name: Assemble distribution
         run: ./gradlew outputVersion server-jetty-app:assemble py-server:assemble
@@ -69,7 +68,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3