diff --git a/bin/travisci b/bin/travisci index f9a71bf608..29e9b60ff5 100755 --- a/bin/travisci +++ b/bin/travisci @@ -7,25 +7,22 @@ FINAGLE_BRANCH=$(git rev-parse --abbrev-ref HEAD) if [ "$FINAGLE_BRANCH" != "master" ]; then FINAGLE_DIR=$(pwd) - # TODO try to use ./sbt of each project instead of finagle's sbt - FINAGLE_SBT=$FINAGLE_DIR/sbt - FINAGLE_TMP_DIR=$(mktemp -d -t ostrich.XXXXXXXXXX.tmp) + FINAGLE_TMP_DIR=$(mktemp -d -t finagle.XXXXXXXXXX.tmp) # util cd $FINAGLE_TMP_DIR git clone https://github.com/twitter/util.git --branch develop cd util - $FINAGLE_SBT ++$TRAVIS_SCALA_VERSION publishLocal + ./sbt ++$TRAVIS_SCALA_VERSION publishLocal # ostrich cd $FINAGLE_TMP_DIR git clone https://github.com/twitter/ostrich.git --branch develop cd ostrich - $FINAGLE_SBT ++$TRAVIS_SCALA_VERSION publishLocal + ./sbt ++$TRAVIS_SCALA_VERSION publishLocal # scrooge-core. Finagle depends on scrooge-core, the rest of scrooge depends on finagle. cd $FINAGLE_TMP_DIR git clone https://github.com/twitter/scrooge.git --branch develop cd scrooge - $FINAGLE_SBT ++$TRAVIS_SCALA_VERSION scrooge-core/publishLocal - + ./sbt ++$TRAVIS_SCALA_VERSION scrooge-core/publishLocal # clean up cd $FINAGLE_DIR rm -rf $FINAGLE_TMP_DIR