From 31d992873468e4b1025655a2cd3d596eaaedd4da Mon Sep 17 00:00:00 2001 From: William Cheng Date: Thu, 15 Nov 2018 12:25:14 +0800 Subject: [PATCH] Revert "force deployment" This reverts commit e5c0d227ab2d1e6dc51c92f473aaaeb35d38b0b3. --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index adcdac65ac1..7c52b26d12e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,19 +115,18 @@ install: script: # fail fast - set -e - # # fail if templates/generators contain carriage return '\r' - # - /bin/bash ./bin/utils/detect_carriage_return.sh - # # fail if generators contain merge conflicts - # - /bin/bash ./bin/utils/detect_merge_conflict.sh - # # fail if generators contain tab '\t' - # - /bin/bash ./bin/utils/detect_tab_in_java_class.sh - # # run integration tests defined in maven pom.xml - # - ./run-in-docker.sh mvn --quiet --batch-mode clean install - # - mvn --quiet --batch-mode verify -Psamples + # fail if templates/generators contain carriage return '\r' + - /bin/bash ./bin/utils/detect_carriage_return.sh + # fail if generators contain merge conflicts + - /bin/bash ./bin/utils/detect_merge_conflict.sh + # fail if generators contain tab '\t' + - /bin/bash ./bin/utils/detect_tab_in_java_class.sh + # run integration tests defined in maven pom.xml + - ./run-in-docker.sh mvn --quiet --batch-mode clean install + - mvn --quiet --batch-mode verify -Psamples after_success: # push to maven repo - - echo "SONATYPE_USERNAME=$SONATYPE_USERNAME, TRAVIS_TAG=$TRAVIS_TAG, TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST" - - if [ $SONATYPE_USERNAME ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then + - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then if [ "$TRAVIS_BRANCH" = "master" ]; then mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml; echo "Finished mvn clean deploy for $TRAVIS_BRANCH";