Skip to content

Commit 51dff9d

Browse files
Merge pull request #54 from scala-exercises/fixes-cross-scalaversion-travis-yml
Fixes after_success sbt task to use the correct scala version
2 parents 80f8d1f + a5a9fb1 commit 51dff9d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ before_install:
2424

2525
after_success:
2626
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.11.8" ]; then
27-
sbt publishSignedAll;
27+
sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
2828
echo "Deploying to Heroku";
2929
docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com;
30-
sbt dockerBuildAndPush;
31-
sbt smoketests/test;
30+
sbt ++$TRAVIS_SCALA_VERSION dockerBuildAndPush;
31+
sbt ++$TRAVIS_SCALA_VERSION smoketests/test;
3232
fi
3333
- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_SCALA_VERSION" = "2.12.1" ]; then
34-
sbt -Devaluator.heroku.name=scala-evaluator-212 publishSignedAll;
34+
sbt ++$TRAVIS_SCALA_VERSION publishSignedAll;
3535
echo "Deploying to Heroku";
3636
docker login --username=noel.m@47deg.com --password=$heroku_token registry.heroku.com;
37-
sbt -Devaluator.heroku.name=scala-evaluator-212 dockerBuildAndPush;
38-
sbt smoketests/test;
37+
sbt ++$TRAVIS_SCALA_VERSION -Devaluator.heroku.name=scala-evaluator-212 dockerBuildAndPush;
38+
sbt ++$TRAVIS_SCALA_VERSION smoketests/test;
3939
fi
4040
- if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
4141
echo "Not in master branch, skipping deploy and release";

0 commit comments

Comments
 (0)