From b0d85c550d18ebefde917db6bc6f2a3ee4463148 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 12 Feb 2016 15:06:20 +0000 Subject: [PATCH] Fix logic with MVN_GOAL --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c33f89..f4ccbe0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - gem install asciidoctor install: - ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh' +- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"' script: - './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true' env: @@ -22,7 +22,8 @@ env: - GIT_EMAIL=dsyer@pivotal.io - CI_DEPLOY_USERNAME=buildmaster - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep "^.*/.*$" && echo true || echo false) - - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" ] && echo deploy || echo install) + - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep "^spring-cloud/.*$" && echo true || echo false) + - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install) - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //') - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false) - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone)