diff options
| author | Florian Müllner <fmuellner@gnome.org> | 2020-02-26 00:18:17 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2020-02-26 06:28:46 +0000 |
| commit | 38954de11ce5d2cc095dff9a2441905059f5a73c (patch) | |
| tree | 81e901797a9c709ed2bff6a214d9a740e93545b7 /.gitlab-ci | |
| parent | 964ea60090d3128d3ed4738034efc869a1de08bc (diff) | |
| download | mutter-38954de11ce5d2cc095dff9a2441905059f5a73c.tar.gz | |
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
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/check-commit-log.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 $? } |