diff --git a/.travis.yml b/.travis.yml index ada2a08956..2bb797ed32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ env: stages: - name: test - if: commit_message !~ /\[skip tests\]/ AND commit_message !~ /\[force[^\]]*\]/ + if: commit_message !~ /\[skip tests\]/ - name: release if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false - name: update_downstream diff --git a/scripts/travis/update_downstream.sh b/scripts/travis/update_downstream.sh index b4316a0307..c81e0ac547 100644 --- a/scripts/travis/update_downstream.sh +++ b/scripts/travis/update_downstream.sh @@ -33,11 +33,7 @@ git status git --no-pager diff pom.xml git add pom.xml -if [[ "${TRAVIS_COMMIT_MESSAGE}" =~ \[force[^\]]*\] ]]; then - FORCE_TOKEN=$(echo "${TRAVIS_COMMIT_MESSAGE}" | sed "s|^.*\(\[force[^]]*\]\).*$|\1|g") - git commit --allow-empty -m "${FORCE_TOKEN} Update upstream version to ${VERSION}" - git push -elif git status --untracked-files=no --porcelain | grep -q '^' ; then +if git status --untracked-files=no --porcelain | grep -q '^' ; then git commit -m "Update upstream version to ${VERSION}" git push else