From 7b26ef9473f9981e0db2a9088f9c6700592e3250 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 22 Sep 2026 08:28:15 -0700 Subject: [PATCH 1/2] Use Java 25 for CI builds Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 4 ++-- .github/workflows/oats-tests.yml | 2 +- .github/workflows/prometheus-test.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7b76007d7..64f4245230 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: 17 + java-version: '25' - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 @@ -60,7 +60,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: 17 + java-version: '25' - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 708f365a75..303e7a4024 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -32,12 +32,12 @@ jobs: with: persist-credentials: false - - name: Set up Java 17 + - name: Set up Java if: matrix.language == 'java' uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: 17 + java-version: '25' - name: Set up gradle if: matrix.language == 'java' diff --git a/.github/workflows/oats-tests.yml b/.github/workflows/oats-tests.yml index d6c47dd346..1e3c37ae90 100644 --- a/.github/workflows/oats-tests.yml +++ b/.github/workflows/oats-tests.yml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: 17 + java-version: '25' - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.github/workflows/prometheus-test.yml b/.github/workflows/prometheus-test.yml index 0511db6018..a021869671 100644 --- a/.github/workflows/prometheus-test.yml +++ b/.github/workflows/prometheus-test.yml @@ -26,7 +26,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: 17 + java-version: '25' - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 From eb92fd8b1f827d480a7ce82ea4e47b4015b8b9ae Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 22 Sep 2026 08:54:26 -0700 Subject: [PATCH 2/2] Use bare Java major values Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/oats-tests.yml | 2 +- .github/workflows/prometheus-test.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 64f4245230..cd29fed46f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '25' + java-version: 25 - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 @@ -60,7 +60,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '25' + java-version: 25 - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 303e7a4024..c15a778500 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -37,7 +37,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '25' + java-version: 25 - name: Set up gradle if: matrix.language == 'java' diff --git a/.github/workflows/oats-tests.yml b/.github/workflows/oats-tests.yml index 1e3c37ae90..b064b9f072 100644 --- a/.github/workflows/oats-tests.yml +++ b/.github/workflows/oats-tests.yml @@ -30,7 +30,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '25' + java-version: 25 - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0 diff --git a/.github/workflows/prometheus-test.yml b/.github/workflows/prometheus-test.yml index a021869671..101991d476 100644 --- a/.github/workflows/prometheus-test.yml +++ b/.github/workflows/prometheus-test.yml @@ -26,7 +26,7 @@ jobs: uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: temurin - java-version: '25' + java-version: 25 - name: Set up gradle uses: gradle/actions/setup-gradle@9c971963bec38e04b3d30dcc455b5382be2fdbfb # v6.3.0