From 665a7fbbcb80f92c2bd101e85b4a9a97e5966247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Fri, 10 Apr 2020 14:18:17 +0000 Subject: [PATCH] ci: Update URL check Gitlab started inserting a /-/ in its URLs, account for that. https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/113 (cherry picked from commit 7b82c5e12b1d70cec6427ac2580b855b9f41dd79) --- .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 cc3bcee6..8d0e2ee0 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 $? }