But continue to use Java 11

nafg · Dec 21, 2023 · 564600a · 564600a
1 parent 1d66d8f
commit 564600a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,20 +24,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13.12, 3.3.1]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
           cache: sbt
 
       - name: Check that workflows are up to date
@@ -71,20 +71,20 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [3.3.1]
-        java: [temurin@8]
+        java: [temurin@11]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (temurin@8)
-        if: matrix.java == 'temurin@8'
+      - name: Setup Java (temurin@11)
+        if: matrix.java == 'temurin@11'
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: 11
           cache: sbt
 
       - name: Download target directories (2.13.12)

diff --git a/.mergify.yml b/.mergify.yml
@@ -8,8 +8,8 @@ pull_request_rules:
       - or:
           - author=scala-steward
           - author=nafg-scala-steward[bot]
-      - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@8)
-      - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@8)
+      - check-success=Build and Test (ubuntu-latest, 2.13.12, temurin@11)
+      - check-success=Build and Test (ubuntu-latest, 3.3.1, temurin@11)
     actions:
         queue:
             name: default
diff --git a/ci.sbt b/ci.sbt
@@ -36,6 +36,7 @@ inThisBuild(List(
       ),
       WorkflowStep.Run(List("mkdir -p slick-additions-entity/.js/target"))
     ),
+  githubWorkflowJavaVersions          := Seq(JavaSpec.temurin("11")),
   githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
   githubWorkflowPublish               := Seq(
     WorkflowStep.Sbt(