diff --git a/project/travis.sh b/project/travis.sh index 0b0fddb5e..8b09447d4 100755 --- a/project/travis.sh +++ b/project/travis.sh @@ -27,30 +27,17 @@ function isMasterOrDevelop() { [ "$TRAVIS_BRANCH" = "master" -o "$TRAVIS_BRANCH" = "develop" ] } -# web sub-project doesn't compile in 2.10 (no scalajs-react) -if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then - IS_210=1 - SBT_COMMANDS="bootstrap/compile coreJVM/compile coreJS/compile cache/compile web/compile testsJVM/test testsJS/test" -else - IS_210=0 - SBT_COMMANDS="compile test" -fi - # Required for ~/.ivy2/local repo tests ~/sbt coreJVM/publish-local # TODO Add coverage once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed -PUSH_GHPAGES=0 +SBT_COMMANDS="compile test" if isNotPr && publish && isMaster; then - SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish cache/publish" - if [ "$IS_210" = 1 ]; then - SBT_COMMANDS="$SBT_COMMANDS plugin/publish" - else - SBT_COMMANDS="$SBT_COMMANDS cli/publish" - fi + SBT_COMMANDS="$SBT_COMMANDS publish" fi +PUSH_GHPAGES=0 if isNotPr && publish && isMasterOrDevelop; then if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.11"; then PUSH_GHPAGES=1