luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix in travis script

This commit is contained in:
Alexandre Archambault 2015-06-17 19:36:53 +02:00
parent 628060d94e
commit 0e230e042d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
project/travis.sh
View File

@ -23,20 +23,17 @@ function isMaster() {
[ "$TRAVIS_BRANCH" = "master" ]
}
# web sub-project doesn't compile in 2.10 (no scalajs-react)
if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
if isNotPr && isJdk7 && isMaster; then
EXTRA_SBT_ARGS="core-jvm/publish core-js/publish cli/publish"
else
EXTRA_SBT_ARGS=""
fi
sbt ++${TRAVIS_SCALA_VERSION} core-jvm/test core-js/test cli/test $EXTRA_SBT_ARGS
SBT_COMMANDS="cli/compile"
else
if isNotPr && isJdk7 && isMaster; then
EXTRA_SBT_ARGS="publish"
else
EXTRA_SBT_ARGS=""
fi
sbt ++${TRAVIS_SCALA_VERSION} test $EXTRA_SBT_ARGS
SBT_COMMANDS="compile"
fi
SBT_COMMANDS="$SBT_COMMANDS core-jvm/test core-js/test"
if isNotPr && isJdk7 && isMaster; then
SBT_COMMANDS="$SBT_COMMANDS core-jvm/publish core-js/publish cli/publish"
fi
sbt ++${TRAVIS_SCALA_VERSION} $SBT_COMMANDS