diff --git a/.travis.yml b/.travis.yml index 4e98a7e..67d9f98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ deploy: provider: releases api_key: secure: rSHtAf8daq9kqpZaHGAfe+ArIOO1/TArti2XKcuHCSfS5zpareosAGKSWPgOukT/zamoKrHmHL58HL93SVyrkahFie86o9l4rMBQ9r1AX5xNilbqEJ5+7q5SknWzckzZx47JlI7Rd8I4yfAGsPtQPb7UflhQFGRgUKrCHpWA61r3z8J5P6ttdLPipQcbdsrDm4Nlv5zM1B4QXFsuDITpvwkYwpOF+BWyZSvU/AhFr3RfZGdlt5ZY+6ClbfiwSQi9lFNspBRbe6zeM6QWTh0UC49NwmONLXVb+soDD3ikeqomJnodpupCpSbcjyXhLt59Dg1JZ4Ty9nF6ks3mzL5/fKq2Tpf9k2DID/1V286qJ87kpWqx6y3/7BhbtjlirI8ADFnG4aLNfYJIJBAhHXXW2fWdHP4yS5BeO9NY5i1Q4UaLv1/lh1YE3ZhR/i/mSyMe44nPPA5YvZDSdhu7S7wQMTjHtsPYtXzers1LKC1WooA9m7135oKZtS94NJ3hxif2XWgDEmlR7+NNae5od4W5rCC93E0V7BWG9LruP3LL73hSM9VrVFnQoghil33sD3E/NM0VXxZqqP5LpCR7bYj9tX3TDmJK/YewsI5+hae06GdOkj2Rke4y6EmRFrTfFFVC/fIvn3NrDf837/mVapdNNPHtUTEpUFMPj5DUbN2RYrg= - file: target/RELEASE_NOTES + file: "target/RELEASE_NOTES" file: "${RELEASE_JAR}" on: tags: true diff --git a/travis.sh b/travis.sh index 4a5db4b..c8ce04f 100755 --- a/travis.sh +++ b/travis.sh @@ -8,9 +8,6 @@ if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$LATEST_TAG" == "$TRAVIS_BRANCH" echo "Setting Maven release values" mvn versions:set -DnewVersion=${LATEST_TAG} mvn versions:commit - echo "Generating release notes from git history" - mkdir -p target - git show -s --pretty=format:"%h - %<|(35)%an%s" $(git rev-list --tags --max-count=1)...$(git show | grep "^commit" | awk '{print $2}') | tee target/RELEASE_NOTES fi @@ -32,3 +29,9 @@ mvn cobertura:cobertura verify sonar:sonar \ -Dsonar.host.url=$SONAR_HOST_URL \ -Dsonar.login=$SONAR_TOKEN \ -B -e -V + +if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$LATEST_TAG" == "$TRAVIS_BRANCH" ]; then + echo "Generating release notes from git history" + mkdir -p target + git show -s --pretty=format:"%h - %<|(35)%an%s" $(git rev-list --tags --max-count=1)...$(git show | grep "^commit" | awk '{print $2}') | tee target/RELEASE_NOTES +fi