From 729061159c79cb18b40949b265ef0add19db2277 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 12 Feb 2016 13:15:27 +0000 Subject: [PATCH] Align travis build with tools in spring-cloud/build --- .travis.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 872098f..f87c767 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,14 +10,18 @@ before_install: - echo "https://$GH_TOKEN:@github.com" > .git/credentials - gem install asciidoctor install: -- ./mvnw --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -- ./docs/src/main/asciidoc/ghpages.sh +- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true +- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh' script: -- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || ./mvnw --settings .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' -- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || ./mvnw --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' +- './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true' env: global: - GIT_NAME="Dave Syer" - 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) + - 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) - secure: ISIGqKfTGO+kOT4ZssyG/MevbTsuKg6BhwxyWshqFshrA7f1uOBjP3tN7P28lazNK7+H0e3JS5uDx+tupZQtkMCV5/mxUGwZa5Vgi8R2Kdtc6/wE0sy01phz8Z05TNlq7ZJ4Ig4Uo5QBPhFrKCdBYKuQvwPqkbFnooCH981w11U=