Skip to content

Commit 73873c0

Browse files
authored
Merge pull request #764 from AVSystem/jdk-25
add support for Java 25 in CI configuration
2 parents 3edec7d + 2956c84 commit 73873c0

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.13.16]
27-
java: [temurin@17, temurin@21]
27+
java: [temurin@17, temurin@21, temurin@25]
2828
runs-on: ${{ matrix.os }}
2929
steps:
3030
- name: Checkout current branch (full)
@@ -48,6 +48,14 @@ jobs:
4848
java-version: 21
4949
cache: sbt
5050

51+
- name: Setup Java (temurin@25)
52+
if: matrix.java == 'temurin@25'
53+
uses: actions/setup-java@v5
54+
with:
55+
distribution: temurin
56+
java-version: 25
57+
cache: sbt
58+
5159
- name: Setup sbt
5260
uses: sbt/setup-sbt@v1
5361

@@ -100,6 +108,14 @@ jobs:
100108
java-version: 21
101109
cache: sbt
102110

111+
- name: Setup Java (temurin@25)
112+
if: matrix.java == 'temurin@25'
113+
uses: actions/setup-java@v5
114+
with:
115+
distribution: temurin
116+
java-version: 25
117+
cache: sbt
118+
103119
- name: Setup sbt
104120
uses: sbt/setup-sbt@v1
105121

project/Commons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ object Commons extends ProjectGroup("commons") {
7171
githubWorkflowTargetTags ++= Seq("v*"),
7272

7373
githubWorkflowArtifactUpload := false,
74-
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21")),
74+
githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21"), JavaSpec.temurin("25")),
7575
githubWorkflowBuildPreamble ++= Seq(
7676
WorkflowStep.Use(
7777
UseRef.Public("actions", "setup-node", "v2"),

0 commit comments

Comments
 (0)