[mutter] ci/check-commit-log: Inverse merge request URL check



commit e7b126eb59028c1e3d88979026d5e235318990f5
Author: Jonas Ã…dahl <jadahl gmail com>
Date:   Wed Nov 4 18:44:01 2020 +0100

    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>

 .gitlab-ci/check-commit-log.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci/check-commit-log.sh b/.gitlab-ci/check-commit-log.sh
index 83118ad679..c7ca1b1069 100755
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -16,10 +16,10 @@ if [ -z "$commits" ]; then
   exit 1
 fi
 
-function commit_message_has_url() {
+function commit_message_has_mr_url() {
   commit=$1
   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 $?
 }
 
@@ -54,8 +54,8 @@ RET=0
 for commit in $commits; do
   commit_short=$(echo $commit | cut -c -8)
 
-  if ! commit_message_has_url $commit; then
-    echo "Commit $commit_short needs a merge request or issue URL"
+  if commit_message_has_mr_url $commit; then
+    echo "Commit $commit_short must not contain a link to its own merge request"
     exit 1
   fi
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]