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.

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

split build jvm,add workers to kernel #2189

Merged
merged 4 commits into from Mar 14, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ env:

cache:
directories:
- $HOME/.m2
- $HOME/.ivy2/cache
- $HOME/.sbt/boot
- $HOME/.sbt
- $HOME/.coursier
# Pants cache
- $HOME/.cache

14 changes: 13 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ lazy val kernelSettings = Seq(
resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Resolver.sonatypeRepo("snapshots")),
fork in test := true,
parallelExecution in Test := false,
scalacOptions in (Compile, doc) := (scalacOptions in (Compile, doc)).value.filter(_ != "-Xfatal-warnings")
) ++ warnUnusedImport ++ update2_12 ++ xlint
Expand Down Expand Up @@ -513,7 +514,18 @@ lazy val publishSettings = Seq(
) ++ credentialSettings ++ sharedPublishSettings ++ sharedReleaseProcess

// These aliases serialise the build for the benefit of Travis-CI.
addCommandAlias("buildJVM", "catsJVM/test")

addCommandAlias("buildKernelJVM", ";kernelJVM/test;kernelLawsJVM/test")

addCommandAlias("buildCoreJVM", ";macrosJVM/test;coreJVM/test")

addCommandAlias("buildTestsJVM", ";lawsJVM/test;testkitJVM/test;testsJVM/test;jvm/test")

addCommandAlias("buildFreeJVM", ";freeJVM/test")

addCommandAlias("buildAlleycatsJVM", ";alleycatsCoreJVM/test;alleycatsLawsJVM/test;alleycatsTestsJVM/test")

addCommandAlias("buildJVM", ";buildKernelJVM;buildCoreJVM;buildTestsJVM;buildFreeJVM;buildAlleycatsJVM")

addCommandAlias("validateJVM", ";scalastyle;buildJVM;mimaReportBinaryIssues;makeMicrosite")

Expand Down
6 changes: 5 additions & 1 deletion kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,13 @@ class Tests extends FunSuite with Discipline {
// The scalacheck defaults (100,100) are too high for scala-js.
final val PropMaxSize: PosZInt = if (Platform.isJs) 10 else 100
final val PropMinSuccessful: PosInt = if (Platform.isJs) 10 else 100
final val PropWorkers: PosInt = if (Platform.isJvm) PosInt(2) else PosInt(1)

implicit override val generatorDrivenConfig: PropertyCheckConfiguration =
PropertyCheckConfiguration(minSuccessful = PropMinSuccessful, sizeRange = PropMaxSize)
PropertyCheckConfiguration(
minSuccessful = PropMinSuccessful,
sizeRange = PropMaxSize,
workers = PropWorkers)


{
Expand Down