inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ACS-2608 Support force directive. (#992)"

Browse Source 
This reverts commit 905e813aa4.
This commit is contained in:
Tom Page
2022-03-22 10:44:55 +00:00
parent 905e813aa4
commit 464db778fa
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -32,7 +32,7 @@ env:
stages: stages:
- name: test - name: test
if: commit_message !~ /\[skip tests\]/ AND commit_message !~ /\[force[^\]]*\]/ if: commit_message !~ /\[skip tests\]/
- name: release - name: release
if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false if: commit_message !~ /\[no release\]/ AND (branch = master OR branch =~ /release\/.*/) AND type != pull_request AND fork = false
- name: update_downstream - name: update_downstream

6
scripts/travis/update_downstream.sh
View File

@@ -33,11 +33,7 @@ git status
git --no-pager diff pom.xml git --no-pager diff pom.xml
git add pom.xml git add pom.xml
if [[ "${TRAVIS_COMMIT_MESSAGE}" =~ \[force[^\]]*\] ]]; then if git status --untracked-files=no --porcelain | grep -q '^' ; 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 commit -m "Update upstream version to ${VERSION}"
git push git push
else else