diff --git a/gradle/buildViaTravis.sh b/gradle/buildViaTravis.sh index 61610d131a..ea385c3e92 100755 --- a/gradle/buildViaTravis.sh +++ b/gradle/buildViaTravis.sh @@ -12,10 +12,15 @@ export GRADLE_OPTS=-Xmx1024m if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]" - ./gradlew -PreleaseMode=pr build + ./gradlew -PreleaseMode=pr build --stacktrace elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then - echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' - ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace + if [ "$TRAVIS_BRANCH" != "3.x" ]; then + echo -e 'Build secondary Branch (no snapshot) => Branch ['$TRAVIS_BRANCH']' + ./gradlew -PreleaseMode=pr build --stacktrace + else + echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']' + ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace + fi elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH'] Tag ['$TRAVIS_TAG']' ./gradlew -PreleaseMode=full -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace diff --git a/gradle/push_javadoc.sh b/gradle/push_javadoc.sh index 2f7e6ee8b9..c8f648258e 100644 --- a/gradle/push_javadoc.sh +++ b/gradle/push_javadoc.sh @@ -14,6 +14,12 @@ if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0 fi +# only when on the 3.x branch and not tagged +if [ "$TRAVIS_BRANCH" != "3.x" ] && [ "$TRAVIS_TAG" == "" ]; then + echo -e "On a secondary branch '$TRAVIS_BRANCH', skipping JavaDocs pushback." + exit 0 +fi + # get the current build tag if any buildTag="$TRAVIS_TAG" echo -e "Travis tag: '$buildTag'"