]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Update Danger check for GitLab references
authorMichal Nowak <mnowak@isc.org>
Thu, 29 Apr 2021 11:24:21 +0000 (13:24 +0200)
committerMichał Kępień <michal@isc.org>
Thu, 29 Apr 2021 11:35:05 +0000 (13:35 +0200)
Release notes now employ a custom :gl: Sphinx role for linking to GitLab
issues/MRs.  Tweak the relevant Danger checks to account for that.

(cherry picked from commit fe1dea657278322a88ebd377feed4559add4f15a)

dangerfile.py

index f9db5bd7d7eac97be9030608a5b461dc3513ba8c..1507da12b21ef286f81ab1f658c7dd144f6d26b2 100644 (file)
@@ -28,7 +28,8 @@ def added_lines(target_branch, paths):
 def lines_containing(lines, string):
     return [l for l in lines if bytes(string, 'utf-8') in l]
 
-issue_or_mr_id_regex = re.compile(br'\[(GL [#!]|RT #)[0-9]+\]')
+changes_issue_or_mr_id_regex = re.compile(br'\[(GL [#!]|RT #)[0-9]+\]')
+relnotes_issue_or_mr_id_regex = re.compile(br':gl:`[#!][0-9]+`')
 release_notes_regex = re.compile(r'doc/(arm|notes)/notes-.*\.(rst|xml)')
 
 modified_files = danger.git.modified_files
@@ -186,7 +187,7 @@ if changes_modified and no_changes_label_set:
 
 changes_added_lines = added_lines(target_branch, ['CHANGES'])
 placeholders_added = lines_containing(changes_added_lines, '[placeholder]')
-identifiers_found = filter(issue_or_mr_id_regex.search, changes_added_lines)
+identifiers_found = filter(changes_issue_or_mr_id_regex.search, changes_added_lines)
 if changes_added_lines:
     if placeholders_added:
         if target_branch != 'main':
@@ -234,7 +235,7 @@ if release_notes_changed and not release_notes_label_set:
 
 if release_notes_changed:
     notes_added_lines = added_lines(target_branch, release_notes_changed)
-    identifiers_found = filter(issue_or_mr_id_regex.search, notes_added_lines)
+    identifiers_found = filter(relnotes_issue_or_mr_id_regex.search, notes_added_lines)
     if notes_added_lines and not any(identifiers_found):
         warn('No valid issue/MR identifiers found in added release notes.')
 else: