From 99a5f434d48269684315fcc7310199db88bb4254 Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 4 Oct 2025 21:07:46 +0200 Subject: [PATCH] Add java 25 to build matrix --- .github/workflows/ci.yml | 18 +++++++++++++++++- build.sbt | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 722269af..008847bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.11.12, 2.12.20, 2.13.17, 3.3.6] - java: [zulu@8, zulu@11, zulu@17, zulu@21] + java: [zulu@8, zulu@11, zulu@17, zulu@21, zulu@25] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -64,6 +64,14 @@ jobs: java-version: 21 cache: sbt + - name: Setup Java (zulu@25) + if: matrix.java == 'zulu@25' + uses: actions/setup-java@v5 + with: + distribution: zulu + java-version: 25 + cache: sbt + - name: Setup sbt uses: sbt/setup-sbt@v1 @@ -129,6 +137,14 @@ jobs: java-version: 21 cache: sbt + - name: Setup Java (zulu@25) + if: matrix.java == 'zulu@25' + uses: actions/setup-java@v5 + with: + distribution: zulu + java-version: 25 + cache: sbt + - name: Setup sbt uses: sbt/setup-sbt@v1 diff --git a/build.sbt b/build.sbt index 35ff8fc9..dafc9eb2 100644 --- a/build.sbt +++ b/build.sbt @@ -163,7 +163,7 @@ Test / parallelExecution := false ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G" ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"), - JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21")) + JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21"), JavaSpec(Zulu, "25")) ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues"))) ThisBuild / githubWorkflowTargetBranches := Seq("2.*") ThisBuild / githubWorkflowTargetTags ++= Seq("v*")