From a8ac3835ad8bb6617c9d123ce899bd8ee59dfb30 Mon Sep 17 00:00:00 2001 From: Alistair Johnson Date: Sun, 11 Mar 2018 21:12:19 +0100 Subject: [PATCH 1/4] Split buildJVM --- build.sbt | 4 +++- kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index b7654f6861..e95df52f5e 100644 --- a/build.sbt +++ b/build.sbt @@ -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 @@ -512,8 +513,9 @@ lazy val publishSettings = Seq( ) ) ++ credentialSettings ++ sharedPublishSettings ++ sharedReleaseProcess + // These aliases serialise the build for the benefit of Travis-CI. -addCommandAlias("buildJVM", "catsJVM/test") +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") addCommandAlias("validateJVM", ";scalastyle;buildJVM;mimaReportBinaryIssues;makeMicrosite") diff --git a/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala b/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala index b5cf16a036..f7f45ae3af 100644 --- a/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala +++ b/kernel-laws/src/test/scala/cats/kernel/laws/LawTests.scala @@ -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) { From 4e733444a448d85bc225a7e89b260d6741944b67 Mon Sep 17 00:00:00 2001 From: Alistair Johnson Date: Sun, 11 Mar 2018 21:54:12 +0100 Subject: [PATCH 2/4] update travis cache --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6ecd6bca73..83afb76816 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,10 @@ env: cache: directories: + - $HOME/.m2 - $HOME/.ivy2/cache - - $HOME/.sbt/boot + - $HOME/.sbt - $HOME/.coursier + # Pants cache + - $HOME/.cache + From ef2d52010fc2e0899f2de098574e2d4447d611dd Mon Sep 17 00:00:00 2001 From: Alistair Johnson Date: Sun, 11 Mar 2018 22:37:49 +0100 Subject: [PATCH 3/4] Clean up build.sbt --- build.sbt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index e95df52f5e..c753b40b8a 100644 --- a/build.sbt +++ b/build.sbt @@ -515,7 +515,11 @@ lazy val publishSettings = Seq( // These aliases serialise the build for the benefit of Travis-CI. -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") +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") addCommandAlias("validateJVM", ";scalastyle;buildJVM;mimaReportBinaryIssues;makeMicrosite") From 5ce1019e0a940b77728a78c35f5404485137af57 Mon Sep 17 00:00:00 2001 From: Alistair Johnson Date: Mon, 12 Mar 2018 18:27:50 +0100 Subject: [PATCH 4/4] More clean up of buildJVM --- build.sbt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index c753b40b8a..8365bc7022 100644 --- a/build.sbt +++ b/build.sbt @@ -513,13 +513,19 @@ lazy val publishSettings = Seq( ) ) ++ credentialSettings ++ sharedPublishSettings ++ sharedReleaseProcess - // These aliases serialise the build for the benefit of Travis-CI. -addCommandAlias("buildAlleycatsJVM", ";alleycatsCoreJVM/test;alleycatsLawsJVM/test;alleycatsTestsJVM/test") -addCommandAlias("buildTestingJVM", ";kernelLawsJVM/test;lawsJVM/test;testkitJVM/test;testsJVM/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", ";macrosJVM/test;kernelJVM/test;buildTestingJVM;jvm/test;coreJVM/test;freeJVM/test;buildAlleycatsJVM") +addCommandAlias("buildJVM", ";buildKernelJVM;buildCoreJVM;buildTestsJVM;buildFreeJVM;buildAlleycatsJVM") addCommandAlias("validateJVM", ";scalastyle;buildJVM;mimaReportBinaryIssues;makeMicrosite")