Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] --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 [email protected] --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";
Expand Down