Fix travis script

This commit is contained in:
Alexandre Archambault 2015-12-30 21:00:10 +01:00
parent c6d8c35b5d
commit 5369913f10
1 changed files with 3 additions and 5 deletions

View File

@ -30,22 +30,20 @@ function isMasterOrDevelop() {
# web sub-project doesn't compile in 2.10 (no scalajs-react) # web sub-project doesn't compile in 2.10 (no scalajs-react)
if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
IS_210=1 IS_210=1
SBT_COMMANDS="cli/compile" SBT_COMMANDS="bootstrap/compile coreJVM/compile coreJS/compile cache/compile web/compile testsJVM/test testsJS/test"
else else
IS_210=0 IS_210=0
SBT_COMMANDS="compile" SBT_COMMANDS="compile test"
fi fi
# Required for ~/.ivy2/local repo tests # Required for ~/.ivy2/local repo tests
~/sbt coreJVM/publish-local ~/sbt coreJVM/publish-local
SBT_COMMANDS="$SBT_COMMANDS test"
# TODO Add coverage once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed # TODO Add coverage once https://github.com/scoverage/sbt-scoverage/issues/111 is fixed
PUSH_GHPAGES=0 PUSH_GHPAGES=0
if isNotPr && publish && isMaster; then if isNotPr && publish && isMaster; then
SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish files/publish" SBT_COMMANDS="$SBT_COMMANDS coreJVM/publish coreJS/publish cache/publish"
if [ "$IS_210" = 1 ]; then if [ "$IS_210" = 1 ]; then
SBT_COMMANDS="$SBT_COMMANDS plugin/publish" SBT_COMMANDS="$SBT_COMMANDS plugin/publish"
else else