From 0e230e042d59af5a08dcd681b238d886ae4966ab Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Wed, 17 Jun 2015 19:36:53 +0200
Subject: [PATCH] Fix in travis script

---
 project/travis.sh | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/project/travis.sh b/project/travis.sh
index d43ce6401..5eb648e70 100755
--- a/project/travis.sh
+++ b/project/travis.sh
@@ -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