From a5a9fb188fc6faa78aba55105e789bdbd51f1718 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno Date: Wed, 5 Apr 2017 18:23:50 +0200 Subject: [PATCH] Fixes after_success sbt task to use the correct scala version --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b8d0eaa..e21e05bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,18 +24,18 @@ before_install: after_success: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.11.8" ]; then - sbt publishSignedAll; + sbt ++$TRAVIS_SCALA_VERSION publishSignedAll; echo "Deploying to Heroku"; docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com; - sbt dockerBuildAndPush; - sbt smoketests/test; + sbt ++$TRAVIS_SCALA_VERSION dockerBuildAndPush; + sbt ++$TRAVIS_SCALA_VERSION smoketests/test; fi - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.1" ]; then - sbt -Devaluator.heroku.name=scala-evaluator-212 publishSignedAll; + sbt ++$TRAVIS_SCALA_VERSION publishSignedAll; echo "Deploying to Heroku"; docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com; - sbt -Devaluator.heroku.name=scala-evaluator-212 dockerBuildAndPush; - sbt smoketests/test; + sbt ++$TRAVIS_SCALA_VERSION -Devaluator.heroku.name=scala-evaluator-212 dockerBuildAndPush; + sbt ++$TRAVIS_SCALA_VERSION smoketests/test; fi - if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then echo "Not in master branch, skipping deploy and release";