From df644a89c4d1ee35461db3683eb2c15f16797dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Sat, 13 Jan 2018 20:59:03 +0100 Subject: [PATCH] no deploy on pull request --- travis/script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/travis/script.sh b/travis/script.sh index 8896e39af..15ca82801 100644 --- a/travis/script.sh +++ b/travis/script.sh @@ -47,8 +47,8 @@ else ant all fi else - #if we are on dev branch - if [ $TRAVIS_BRANCH = "dev" ]; then + #if we are on dev branch and it's not a pull request + if [ $TRAVIS_BRANCH = "dev" && $TRAVIS_PULL_REQUEST = "false" ]; then # create nightly build... TAGGER_NAME="Travis CI" @@ -66,7 +66,7 @@ else #generate prop file - VERSION_NUMBER=`echo $TRAVIS_TAG|sed 's/version//'` + VERSION_NUMBER=$LAST_STABLE_VER VERSION_MAJOR=`echo $VERSION_NUMBER|cut -d '.' -f 1` VERSION_MINOR=`echo $VERSION_NUMBER|cut -d '.' -f 2` VERSION_RELEASE=`echo $VERSION_NUMBER|cut -d '.' -f 3`