Skip to content

Commit

Permalink
Merge pull request #75 from slick/build-on-java-11
Browse files Browse the repository at this point in the history
Build on Java 11
  • Loading branch information
nafg authored Sep 26, 2024
2 parents 925aa76 + 11f5417 commit 137e5c0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [2.12.19]
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
Expand Down
2 changes: 1 addition & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pull_request_rules:
- author=scala-steward
- author=slick-scala-steward[bot]
- author=renovate[bot]
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@8)
- check-success=Build and Test (ubuntu-latest, 2.12.19, temurin@11)
actions:
queue:
name: default
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import _root_.io.github.nafg.mergify.dsl._
import _root_.io.github.nafg.mergify.dsl.*


mergifyExtraConditions := Seq(
Expand All @@ -20,7 +20,7 @@ libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value
Compile / unmanagedClasspath ++= (Compile / unmanagedResources).value
libraryDependencies += "com.typesafe.slick" %% "slick" % "3.5.1"

githubWorkflowJavaVersions := JavaSpec.temurin("8") +: githubWorkflowJavaVersions.value
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("11"))

ThisBuild / githubWorkflowBuild := Seq(WorkflowStep.Sbt(List("runAll"), name = Some(s"Run all main classes")))

Expand Down

0 comments on commit 137e5c0

Please sign in to comment.