Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable coverage and docs #3096

Merged
merged 6 commits into from
Oct 11, 2019
Merged

Enable coverage and docs #3096

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
887dc38
Enable scoverage in 2.13 build
DieBauer Oct 2, 2019
909f1c6
Enable apidoc generation for 2.13
DieBauer Oct 2, 2019
0b3214e
travis: Enable codecoverage for jvm build
DieBauer Oct 8, 2019
58f3d5f
Add flag to codecov to differentiate scala versions
DieBauer Oct 9, 2019
3e4d184
Remove sbt keys that do nothing
DieBauer Oct 9, 2019
3f98b90
Merge branch 'master' into enable-coverage-and-docs
DieBauer Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ before_install:
- export PATH=${PATH}:./vendor/bundle
- if [[ ! -z "$HydraLicense" ]]; then
mkdir -p /home/travis/.triplequote/metrics/config && echo "$HydraLicense" > "/home/travis/.triplequote/hydra.license" && cp hydra-metrics-service.conf /home/travis/.triplequote/metrics/config/metrics-service.conf;
fi
fi

stages:
- name: styling
Expand All @@ -29,11 +29,6 @@ stages:
jobs:
include:
# it can speed up the overall build to have the longer-running jobs at the top of this list.
- stage: test
env: TEST="coverage"
install: pip install --user codecov
script: sbt coverage buildJVM bench/test coverageReport && codecov

- stage: test
env: TEST="JS tests"
# http://austinpray.com/ops/2015/09/20/change-travis-node-version.html
Expand All @@ -44,13 +39,15 @@ jobs:
- &jvm_tests
stage: test
env: TEST="JVM tests"
script: sbt ++$TRAVIS_SCALA_VERSION! buildJVM bench/test
install: pip install --user codecov
script: sbt ++$TRAVIS_SCALA_VERSION! coverage buildJVM bench/test coverageReport
scala: *scala_version_212
after_success: codecov -F scala_version_212
- <<: *jvm_tests
scala: *scala_version_213
# the bench module has dependencies not available in Scala 2.13, so don't test it
script: sbt ++$TRAVIS_SCALA_VERSION! buildJVM
after_success: codecov -F scala_version_213


- stage: test
env: TEST="docs"
install: gem install jekyll -v 2.5
Expand All @@ -59,7 +56,7 @@ jobs:
- stage: test
env: TEST="scalafix"
script: cd scalafix && sbt tests/test

- stage: test
env: TEST="binary compatibility"
script: sbt ++$TRAVIS_SCALA_VERSION! validateBC
Expand Down
13 changes: 2 additions & 11 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ import scala.xml.transform.{RewriteRule, RuleTransformer}
import sbtcrossproject.CrossPlugin.autoImport.{crossProject, CrossType}

lazy val scoverageSettings = Seq(
coverageEnabled := {
if (priorTo2_13(scalaVersion.value))
coverageEnabled.value
else
false
},
coverageEnabled := coverageEnabled.value,
DieBauer marked this conversation as resolved.
Show resolved Hide resolved
coverageMinimum := 60,
coverageFailOnMinimum := false,
coverageHighlighting := true
Expand Down Expand Up @@ -77,11 +72,7 @@ lazy val commonSettings = commonScalaVersionSettings ++ Seq(
val unchanged = doctestGenTests.value
if (priorTo2_13(scalaVersion.value)) unchanged else Nil
},
// TODO: re-enable disable scaladoc on 2.13 due to https://github.com/scala/bug/issues/11045
sources in (Compile, doc) := {
val docSource = (sources in (Compile, doc)).value
if (priorTo2_13(scalaVersion.value)) docSource else Nil
}
sources in (Compile, doc) := (sources in (Compile, doc)).value
DieBauer marked this conversation as resolved.
Show resolved Hide resolved
) ++ warnUnusedImport

def macroDependencies(scalaVersion: String) =
Expand Down