From cda5eb03e29fe99935cfefeeb220d0cb8c65d43d Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Fri, 1 Dec 2017 16:07:29 -0800 Subject: [PATCH] Fix deploy script so as not to push release version --- .travis.yml | 10 +--------- scripts/travis-deploy.sh | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100755 scripts/travis-deploy.sh diff --git a/.travis.yml b/.travis.yml index 42375b4..462474b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,4 @@ jdk: - oraclejdk8 script: - - if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then - sbt ++$TRAVIS_SCALA_VERSION "; test; publish"; - else - sbt ++$TRAVIS_SCALA_VERSION test; - fi; - else - sbt ++$TRAVIS_SCALA_VERSION test; - fi + - ./script/travis-deploy.sh diff --git a/scripts/travis-deploy.sh b/scripts/travis-deploy.sh new file mode 100755 index 0000000..6722bb6 --- /dev/null +++ b/scripts/travis-deploy.sh @@ -0,0 +1,15 @@ +#!/bin/bash +set -ev + +VERSION=`perl -npe "s/version in ThisBuild\s+:=\s+\"(.*)\"/\1/" version.sbt | sed -e "/^$/d"` + +# Deploy a snapshot version only for master branch and jdk8 +if [[ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]]; then + if [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$VERSION" == *SNAPSHOT ]]; then + sbt ++$TRAVIS_SCALA_VERSION "; test; publish"; + else + sbt ++$TRAVIS_SCALA_VERSION test; + fi; +else + sbt ++$TRAVIS_SCALA_VERSION test; +fi;