add temurin 21 to CI

scala-steward-org · Sep 25, 2024 · 8060406 · 8060406
1 parent c6a6d03
commit 8060406
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13]
-        java: [temurin@17, temurin@11]
+        java: [temurin@21, temurin@17, temurin@11]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -42,6 +42,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
+        run: sbt +update
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'
@@ -103,7 +116,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [temurin@17]
+        java: [temurin@21]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install sbt
@@ -115,6 +128,19 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Setup Java (temurin@21)
+        id: setup-java-temurin-21
+        if: matrix.java == 'temurin@21'
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: sbt
+
+      - name: sbt update
+        if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
+        run: sbt +update
+
       - name: Setup Java (temurin@17)
         id: setup-java-temurin-17
         if: matrix.java == 'temurin@17'

diff --git a/.mergify.yml b/.mergify.yml
@@ -21,6 +21,7 @@ pull_request_rules:
   - or:
     - author=scala-steward
     - author=scala-steward-dev
+  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@21)
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
   - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
   actions:

diff --git a/build.sbt b/build.sbt
@@ -50,7 +50,7 @@ ThisBuild / githubWorkflowPublish := Seq(
     name = Some("Publish Docker image")
   )
 )
-ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec(Temurin, "17"), JavaSpec(Temurin, "11"))
+ThisBuild / githubWorkflowJavaVersions := Seq("21", "17", "11").map(JavaSpec(Temurin, _))
 ThisBuild / githubWorkflowBuild :=
   Seq(
     WorkflowStep