Skip to content

Commit

Permalink
Disable javascript builds
Browse files Browse the repository at this point in the history
I don't believe anybody is using this project with scala-js, and I am
having trouble getting travis-ci to finish running the tests under
javasciprt (I think), so I'm trying disabling javascript so I can try to
get a build out that depends on a more recent version of cats.
  • Loading branch information
stew committed Sep 16, 2016
1 parent 11ced78 commit 3b6d963
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
1 change: 0 additions & 1 deletion .jvmopts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
-Dfile.encoding=UTF8
-Xms1G
-Xmx3G
-XX:MaxPermSize=512M
-XX:ReservedCodeCacheSize=250M
-XX:+TieredCompilation
-XX:-UseGCOverheadLimit
Expand Down
19 changes: 11 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,31 @@ scalaVersion in Global := "2.11.8"

resolvers in Global += Resolver.sonatypeRepo("snapshots")

lazy val dogs = project.in(file(".")).aggregate(dogsJVM, dogsJS).settings(noPublishSettings)
lazy val dogs = project.in(file(".")).aggregate(dogsJVM/*, dogsJS*/).settings(noPublishSettings)

lazy val dogsJVM = project.aggregate(coreJVM, docs, testsJVM, bench).settings(noPublishSettings)
lazy val dogsJS = project.aggregate(coreJS, testsJS).settings(noPublishSettings)
// lazy val dogsJS = project.aggregate(coreJS, testsJS).settings(noPublishSettings)

lazy val core = crossProject.crossType(CrossType.Pure)
.jsSettings(commonJsSettings:_*)
// .jsSettings(commonJsSettings:_*)


lazy val coreJVM = core.jvm.settings(publishSettings)
lazy val coreJS = core.js.settings(publishSettings)
// lazy val coreJS = core.js.settings(noPublishSettings)

lazy val tests = crossProject.crossType(CrossType.Pure) dependsOn core
.jsSettings(commonJsSettings:_*)
// .jsSettings(commonJsSettings:_*)

lazy val testsJVM = tests.jvm.settings(noPublishSettings)
lazy val testsJS = tests.js.settings(noPublishSettings)
// lazy val testsJS = tests.js.settings(noPublishSettings)

lazy val docs = project.dependsOn(coreJVM).settings(noPublishSettings)

lazy val bench = project.dependsOn(coreJVM).settings(noPublishSettings)

lazy val botBuild = settingKey[Boolean]("Build by TravisCI instead of local dev environment")

/*
lazy val commonJsSettings = Seq(
scalaJSStage in Global := FastOptStage,
parallelExecution := false,
Expand All @@ -44,14 +45,16 @@ lazy val commonJsSettings = Seq(
// batch mode decreases the amount of memory needed to compile scala.js code
scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(botBuild.value)
)
*/

addCommandAlias("buildJVM", ";coreJVM/compile;coreJVM/test;testsJVM/test;bench/test")

addCommandAlias("validateJVM", ";scalastyle;buildJVM;makeSite")

addCommandAlias("validateJS", ";coreJS/compile;testsJS/test")
//addCommandAlias("validateJS", ";coreJS/compile;testsJS/test")

addCommandAlias("validate", ";validateJS;validateJVM")
//addCommandAlias("validate", ";validateJS;validateJVM")
addCommandAlias("validate", ";validateJVM")

addCommandAlias("gitSnapshots", ";set version in ThisBuild := git.gitDescribedVersion.value.get + \"-SNAPSHOT\"")

Expand Down
3 changes: 2 additions & 1 deletion scripts/travis-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ coverage="$sbt_cmd coverage validateJVM coverageReport && bash <(curl -s https:/
scala_js="$sbt_cmd coreJS/compile" # && $sbt_cmd testsJS/test"
scala_jvm="$sbt_cmd coreJVM/compile"

run_cmd="$coverage && $scala_js && $scala_jvm $publish_cmd"
# run_cmd="$coverage && $scala_js && $scala_jvm $publish_cmd"
run_cmd="$coverage && $scala_jvm $publish_cmd"
eval $run_cmd

0 comments on commit 3b6d963

Please sign in to comment.