Skip to content

Commit

Permalink
CI - do not run mdoc with Java 8
Browse files Browse the repository at this point in the history
  • Loading branch information
jenshalm committed Nov 21, 2023
1 parent 401570a commit 9de7647
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc

- name: Build manual
if: matrix.scala == '2.12' && matrix.project == 'rootJVM'
if: matrix.scala == '2.12' && matrix.project == 'rootJVM' && matrix.java == 'temurin@17'
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' docs/mdoc docs/laikaSite

- name: sbt scripted tests
Expand Down
4 changes: 3 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ inThisBuild(
WorkflowStep.Sbt(
List("docs/mdoc", "docs/laikaSite"),
name = Some("Build manual"),
cond = Some("matrix.scala == '2.12' && matrix.project == 'rootJVM'")
cond = Some(
"matrix.scala == '2.12' && matrix.project == 'rootJVM' && matrix.java == 'temurin@17'"
)
),
WorkflowStep.Sbt(
List("plugin/scripted"),
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")

addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.4.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.1")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")

Expand Down

0 comments on commit 9de7647

Please sign in to comment.