From 38954de11ce5d2cc095dff9a2441905059f5a73c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Wed, 26 Feb 2020 00:18:17 +0100 Subject: [PATCH] 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/mutter/-/merge_requests/1090 --- .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 3854eb9df..99fa2b6da 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 $? }