Skip to content

Commit 623178c

Browse files
authored
Merge pull request #3921 from armanbilge/topic/mdoc-jdk-17
2 parents 95e8e53 + 0134b3a commit 623178c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
- shell: bash
250250
run: sbt '++ ${{ matrix.scala }}' '${{ matrix.ci }}'
251251

252-
- if: (matrix.scala == '2.13.12' || matrix.scala == '3.3.1') && matrix.ci == 'ciJVM'
252+
- if: (matrix.scala == '2.13.12' || matrix.scala == '3.3.1') && matrix.ci == 'ciJVM' && matrix.java == 'temurin@17'
253253
shell: bash
254254
run: sbt '++ ${{ matrix.scala }}' docs/mdoc
255255

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ ThisBuild / githubWorkflowBuild := Seq("JVM", "JS", "Native").map { platform =>
190190
WorkflowStep.Sbt(
191191
List("docs/mdoc"),
192192
cond = Some(
193-
s"(matrix.scala == '$Scala213' || matrix.scala == '$Scala3') && matrix.ci == 'ciJVM'")),
193+
s"(matrix.scala == '$Scala213' || matrix.scala == '$Scala3') && matrix.ci == 'ciJVM' && matrix.java == '${LatestJava.render}'")
194+
),
194195
WorkflowStep.Run(
195196
List("example/test-jvm.sh ${{ matrix.scala }}"),
196197
name = Some("Test Example JVM App Within Sbt"),

0 commit comments

Comments
 (0)