[gnome-shell] ci: Adjust URL check



commit 9a3ed0056e0ca270a1951018854909fc59fca7a3
Author: Florian Müllner <fmuellner gnome org>
Date:   Wed Feb 26 00:18:17 2020 +0100

    ci: Adjust URL check
    
    While the old merge request URLs still work, gitlab recently started
    including an additional /- for merge requests.
    
    Adjust the regex to account for that, so that simply copying the URL
    from gitlab works again.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1048

 .gitlab-ci/check-commit-log.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/.gitlab-ci/check-commit-log.sh b/.gitlab-ci/check-commit-log.sh
index cc3bcee602..8d0e2ee039 100755
--- a/.gitlab-ci/check-commit-log.sh
+++ b/.gitlab-ci/check-commit-log.sh
@@ -19,7 +19,7 @@ fi
 function commit_message_has_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/\(-/\)\?\(issues\|merge_requests\)/[0-9]\+\|https://bugzilla.gnome.org/show_bug.cgi?id=[0-9]\+\)"
   return $?
 }
 


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