diff --git a/.travis.yml b/.travis.yml index 7945b951..bd9b956b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,8 @@ language: scala dist: trusty jdk: - oraclejdk8 - -matrix: - include: - - scala: 2.12.9 - env: - - SBT_VERSION=1.3.4 +scala: + - 2.12.9 before_install: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then @@ -19,22 +15,20 @@ install: - gem install jekyll -v 4 script: - - sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION clean compile test - - sbt ++$TRAVIS_SCALA_VERSION ^^$SBT_VERSION scripted; + - sbt ++$TRAVIS_SCALA_VERSION clean compile test + - sbt ++$TRAVIS_SCALA_VERSION scripted; after_success: - if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then if grep -q "SNAPSHOT" version.sbt; then - sbt ^^$SBT_VERSION publish; + sbt publish; else - if [ "$SBT_VERSION" = "1.3.4" ]; then - sbt ^^$SBT_VERSION orgUpdateDocFiles; - git reset --hard HEAD; - git clean -f; - git checkout master; - git pull origin master; - sbt ^^$SBT_VERSION release; - sbt ^^$SBT_VERSION docs/publishMicrosite; - fi + sbt orgUpdateDocFiles; + git reset --hard HEAD; + git clean -f; + git checkout master; + git pull origin master; + sbt release; + sbt docs/publishMicrosite; fi fi