From 5dba631fe13e6c684e86441c878f4e07b5afb5b6 Mon Sep 17 00:00:00 2001 From: Eric K Richardson Date: Wed, 28 Apr 2021 15:12:21 -0700 Subject: [PATCH] Fix #341: Enable coverage after plugin is released for 2.12.13 --- .github/workflows/ci.yml | 4 ++-- build.sbt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73abafd0..6939ba14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -79,7 +79,7 @@ jobs: - name: Validate JVM (scala 2) if: matrix.platform == 'jvm' && matrix.scala == '2.12.13' - run: sbt ++${{ matrix.scala }} jvm/checkCI docs/mdoc + run: sbt ++${{ matrix.scala }} coverage jvm/checkCI docs/mdoc coverageReport - name: Upload Codecov Results if: matrix.platform == 'jvm' && matrix.scala == '2.12.13' @@ -124,4 +124,4 @@ jobs: run: sbt ++${{ matrix.scala }} scalafmtCheckAll - if: matrix.platform == 'jvm' && matrix.scala == '2.12.13' - run: sbt ++${{ matrix.scala }} scalafmtSbtCheck \ No newline at end of file + run: sbt ++${{ matrix.scala }} scalafmtSbtCheck diff --git a/build.sbt b/build.sbt index e6ef854a..091b3d13 100644 --- a/build.sbt +++ b/build.sbt @@ -37,8 +37,7 @@ ThisBuild / githubWorkflowBuild := Seq( name = Some("Setup codecov"), cond = Some(JvmCond + " && " + Scala212Cond) ), - // Avoid coverage, see https://github.com/scoverage/sbt-scoverage/issues/319 - WorkflowStep.Sbt(List(/*"coverage",*/ "jvm/checkCI", "docs/mdoc"/*, "coverageReport"*/), + WorkflowStep.Sbt(List("coverage", "jvm/checkCI", "docs/mdoc", "coverageReport"), name = Some("Validate JVM (scala 2)"), cond = Some(JvmCond + " && " + Scala212Cond) ),