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

split build jvm,add workers to kernel #2189

Merged
merged 4 commits into from Mar 14, 2018
Merged

split build jvm,add workers to kernel #2189

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8ac383
Split buildJVM
Alistair-Johnson Mar 11, 2018
4e73344
update travis cache
Alistair-Johnson Mar 11, 2018
ef2d520
Clean up build.sbt
Alistair-Johnson Mar 11, 2018
5ce1019
More clean up of buildJVM
Alistair-Johnson Mar 12, 2018
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
View file
Open in desktop
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

8 changes: 7 additions & 1 deletion build.sbt
View file
Open in desktop
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 @@ -512,8 +513,13 @@ lazy val publishSettings = Seq(
)
) ++ credentialSettings ++ sharedPublishSettings ++ sharedReleaseProcess


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

addCommandAlias("buildTestingJVM", ";kernelLawsJVM/test;lawsJVM/test;testkitJVM/test;testsJVM/test")

addCommandAlias("buildJVM", ";macrosJVM/test;kernelJVM/test;buildTestingJVM;jvm/test;coreJVM/test;freeJVM/test;buildAlleycatsJVM")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry to nitpick, but this gets harder for me to track what's included in what. maybe we break out a "buildKernelJVM" and a "buildFreeJVM" too for the sake of a clearer structure? Just a thought.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh. I originally had:

-addCommandAlias("buildJVM", ";macrosJVM/test;kernelJVM/test;kernelLawsJVM/test;lawsJVM/test;testkitJVM/test;testsJVM/test;jvm/test;coreJVM/test;freeJVM/test;alleycatsCoreJVM/test;alleycatsLawsJVM/test;alleycatsTestsJVM/test")

Ha! Not a problem to break up more, it's more confusing than it should be whatever we do, so I thought I should PR something to get some thoughts. I'll update it now.


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

Expand Down
6 changes: 5 additions & 1 deletion kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala
View file
Open in desktop
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