Skip to content

Commit

Permalink
Merge pull request typelevel#1298 from kailuowang/topics/fix-build-tr…
Browse files Browse the repository at this point in the history
…avis

fix botBuild value on travis
  • Loading branch information
non committed Aug 20, 2016
2 parents 34360f8 + e76450c commit ae69eaf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ env:
- secure: Kf44XQFpq2QGe3rn98Dsf5Uz3WXzPDralS54co7sqT5oQGs1mYLYZRYz+I75ZSo5ffZ86H7M+AI9YFofqGwAjBixBbqf1tGkUh3oZp2fN3QfqzazGV3HzC+o41zALG5FL+UBaURev9ChQ5fYeTtFB7YAzejHz4y5E97awk934Rg=
- secure: QbNAu0jCaKrwjJi7KZtYEBA/pYbTJ91Y1x/eLAJpsamswVOvwnThA/TLYuux+oiZQCiDUpBzP3oxksIrEEUAhl0lMtqRFY3MrcUr+si9NIjX8hmoFwkvZ5o1b7pmLF6Vz3rQeP/EWMLcljLzEwsrRXeK0Ei2E4vFpsg8yz1YXJg=
- TRAVIS_NODE_VERSION="4"
- CATS_BOT_BUILD=true

cache:
directories:
- $HOME/.sbt/0.13/dependency
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ lazy val commonJsSettings = Seq(
requiresDOM := false,
jsEnv := NodeJSEnv().value,
// Only used for scala.js for now
botBuild := sys.props.getOrElse("CATS_BOT_BUILD", default="false") == "true",
botBuild := scala.sys.env.get("TRAVIS").isDefined,
// batch mode decreases the amount of memory needed to compile scala.js code
scalaJSOptimizerOptions := scalaJSOptimizerOptions.value.withBatchMode(botBuild.value)
)
Expand Down

0 comments on commit ae69eaf

Please sign in to comment.