From 905e813aa40dbc26d0622063cf516e13a531f680 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Tue, 22 Mar 2022 10:35:09 +0000 Subject: [PATCH] ACS-2608 Support force directive. (#992) * ACS-2608 Support force directive. * ACS-2608 Rename bash variable to match convention. * ACS-2608 Use 14.121.x for branch. * [force 7.2.0-A27.1] ACS-2608 Test force release. * [force 7.2.0-A27.1] ACS-2608 Fix regex for force. * [maven-release-plugin][skip ci] prepare release 14.121.1 * [maven-release-plugin][skip ci] prepare for next development iteration * [force 7.2.0-A27.2] ACS-2608 Test force release. * [maven-release-plugin][skip ci] prepare release 14.121.2 * [maven-release-plugin][skip ci] prepare for next development iteration * [force 7.2.0-A27.3] ACS-2608 Test force release. * [maven-release-plugin][skip ci] prepare release 14.121.3 * [maven-release-plugin][skip ci] prepare for next development iteration * [force 7.2.0-A27.4] ACS-2608 Test force release. * [maven-release-plugin][skip ci] prepare release 14.121.4 * [maven-release-plugin][skip ci] prepare for next development iteration * ACS-2608 Revert change to version. Co-authored-by: Travis CI User --- .travis.yml | 2 +- scripts/travis/update_downstream.sh | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2bb797ed32..ada2a08956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ env: stages: - name: test - if: commit_message !~ /\[skip tests\]/ + if: commit_message !~ /\[skip tests\]/ AND commit_message !~ /\[force[^\]]*\]/ - 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 c81e0ac547..b4316a0307 100644 --- a/scripts/travis/update_downstream.sh +++ b/scripts/travis/update_downstream.sh @@ -33,7 +33,11 @@ git status git --no-pager diff pom.xml git add pom.xml -if git status --untracked-files=no --porcelain | grep -q '^' ; then +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 git commit -m "Update upstream version to ${VERSION}" git push else