Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

travis-apidoc: reference PR only in merge commit for less noise in the PR

This commit is contained in:
Daniel Hahler 2016-04-05 00:27:57 +02:00
parent 7f17f6bc0f
commit a10431e7a4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build-utils/travis-apidoc.sh
View File

@ -72,10 +72,6 @@ Last commit message:
$(cd $REPO_DIR && git log -1 --pretty=format:%s) $(cd $REPO_DIR && git log -1 --pretty=format:%s)
Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}" Build URL: https://travis-ci.org/awesomeWM/awesome/builds/${TRAVIS_BUILD_ID}"
if [ "$TRAVIS_PULL_REQUEST" != false ]; then
COMMIT_MSG="$COMMIT_MSG
Pull request: https://github.com/awesomeWM/awesome/pull/${TRAVIS_PULL_REQUEST}"
fi
git commit -m "[relevant] $COMMIT_MSG" git commit -m "[relevant] $COMMIT_MSG"
# Commit the irrelevant changes. # Commit the irrelevant changes.
@ -94,7 +90,12 @@ git tag -d _old
git checkout "$BRANCH" git checkout "$BRANCH"
OLD_REV="$(git rev-parse --short HEAD)" OLD_REV="$(git rev-parse --short HEAD)"
git merge --no-ff -m "$COMMIT_MSG" merged-update MERGE_COMMIT_MSG="$COMMIT_MSG"
if [ "$TRAVIS_PULL_REQUEST" != false ]; then
COMMIT_MSG="$COMMIT_MSG
Pull request: https://github.com/awesomeWM/awesome/pull/${TRAVIS_PULL_REQUEST}"
fi
git merge --no-ff -m "$MERGE_COMMIT_MSG" merged-update
NEW_REV="$(git rev-parse --short HEAD)" NEW_REV="$(git rev-parse --short HEAD)"
git push --quiet origin "$BRANCH" git push --quiet origin "$BRANCH"