ci/check-commit-log: Inverse merge request URL check

It's from now on the responsibility of marge-bot to append merge request
urls to commit messages, so they should not be part of the commit
message itself.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1549>
This commit is contained in:
Jonas Ådahl 2020-11-04 18:44:01 +01:00
parent 86f02c758b
commit e7b126eb59

View File

@ -16,10 +16,10 @@ if [ -z "$commits" ]; then
exit 1 exit 1
fi fi
function commit_message_has_url() { function commit_message_has_mr_url() {
commit=$1 commit=$1
commit_message=$(git show -s --format='format:%b' $commit) commit_message=$(git show -s --format='format:%b' $commit)
echo "$commit_message" | grep -qe "\($CI_MERGE_REQUEST_PROJECT_URL/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)" echo "$commit_message" | grep -qe "^$CI_MERGE_REQUEST_PROJECT_URL\/\(-\/\)\?merge_requests\/$CI_MERGE_REQUEST_IID$"
return $? return $?
} }
@ -54,8 +54,8 @@ RET=0
for commit in $commits; do for commit in $commits; do
commit_short=$(echo $commit | cut -c -8) commit_short=$(echo $commit | cut -c -8)
if ! commit_message_has_url $commit; then if commit_message_has_mr_url $commit; then
echo "Commit $commit_short needs a merge request or issue URL" echo "Commit $commit_short must not contain a link to its own merge request"
exit 1 exit 1
fi fi