Skip to content

Commit 876445d

Browse files
authored
Add java 25 to build matrix (#770)
1 parent 3bdeb08 commit 876445d

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

.github/workflows/ci.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
os: [ubuntu-latest]
2626
scala: [2.11.12, 2.12.20, 2.13.17, 3.3.6]
27-
java: [zulu@8, zulu@11, zulu@17, zulu@21]
27+
java: [zulu@8, zulu@11, zulu@17, zulu@21, zulu@25]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
@@ -64,6 +64,14 @@ jobs:
6464
java-version: 21
6565
cache: sbt
6666

67+
- name: Setup Java (zulu@25)
68+
if: matrix.java == 'zulu@25'
69+
uses: actions/setup-java@v5
70+
with:
71+
distribution: zulu
72+
java-version: 25
73+
cache: sbt
74+
6775
- name: Setup sbt
6876
uses: sbt/setup-sbt@v1
6977

@@ -129,6 +137,14 @@ jobs:
129137
java-version: 21
130138
cache: sbt
131139

140+
- name: Setup Java (zulu@25)
141+
if: matrix.java == 'zulu@25'
142+
uses: actions/setup-java@v5
143+
with:
144+
distribution: zulu
145+
java-version: 25
146+
cache: sbt
147+
132148
- name: Setup sbt
133149
uses: sbt/setup-sbt@v1
134150

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Test / parallelExecution := false
163163

164164
ThisBuild / githubWorkflowSbtCommand := "sbt -J-Xmx2G"
165165
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Zulu, "8"), JavaSpec(Zulu, "11"),
166-
JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21"))
166+
JavaSpec(Zulu, "17"), JavaSpec(Zulu, "21"), JavaSpec(Zulu, "25"))
167167
ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("test", "mimaReportBinaryIssues")))
168168
ThisBuild / githubWorkflowTargetBranches := Seq("2.*")
169169
ThisBuild / githubWorkflowTargetTags ++= Seq("v*")

0 commit comments

Comments
 (0)