From 8c875b2f1b0fa1e2ebc608b5628bef4ac0582589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 5 Jan 2024 12:55:58 +0100 Subject: [PATCH 1/3] Prepare release notes for BIND 9.18.22 --- doc/arm/notes.rst | 2 +- .../{notes-current.rst => notes-9.18.22.rst} | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) rename doc/notes/{notes-current.rst => notes-9.18.22.rst} (93%) diff --git a/doc/arm/notes.rst b/doc/arm/notes.rst index 1caec1b103..aa92b769d0 100644 --- a/doc/arm/notes.rst +++ b/doc/arm/notes.rst @@ -35,7 +35,7 @@ information about each release, and source code. .. include:: ../notes/notes-known-issues.rst -.. include:: ../notes/notes-current.rst +.. include:: ../notes/notes-9.18.22.rst .. include:: ../notes/notes-9.18.21.rst .. include:: ../notes/notes-9.18.20.rst .. include:: ../notes/notes-9.18.19.rst diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-9.18.22.rst similarity index 93% rename from doc/notes/notes-current.rst rename to doc/notes/notes-9.18.22.rst index 24f3a3c331..2695a10e37 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-9.18.22.rst @@ -32,21 +32,6 @@ Security Fixes features were enabled. This has been fixed. :cve:`2023-5679` :gl:`#4334` -New Features -~~~~~~~~~~~~ - -- None. - -Removed Features -~~~~~~~~~~~~~~~~ - -- None. - -Feature Changes -~~~~~~~~~~~~~~~ - -- None. - Bug Fixes ~~~~~~~~~ From 69014521177009257ff5de13195dc19aa56e47e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 5 Jan 2024 12:55:58 +0100 Subject: [PATCH 2/3] Tweak and reword release notes --- doc/notes/notes-9.18.22.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/notes/notes-9.18.22.rst b/doc/notes/notes-9.18.22.rst index 2695a10e37..c2d3375b4f 100644 --- a/doc/notes/notes-9.18.22.rst +++ b/doc/notes/notes-9.18.22.rst @@ -35,9 +35,9 @@ Security Fixes Bug Fixes ~~~~~~~~~ -- Fix statistics export to use full 64 bit signed numbers instead of truncating - values to unsigned 32 bits. Export was truncating values since BIND 9.15.0. - :gl:`#4467` +- The counters exported via the statistics channel were changed back to + 64-bit signed values; they were being inadvertently truncated to + unsigned 32-bit values since BIND 9.15.0. :gl:`#4467` Known Issues ~~~~~~~~~~~~ From 0eb83555ea5a22c52929eb26269b55fe551bee6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Fri, 5 Jan 2024 12:51:13 +0100 Subject: [PATCH 3/3] Fix Danger rules for flagging release note issues The logic contained in dangerfile.py incorrectly warns about missing release note changes for merge requests preparing release documentation as such merge requests rename files in the doc/notes/ directory. This (correctly) causes these files to be passed to dangerfile.py via danger.git.created_files and danger.git.deleted_files rather than via danger.git.modified_files, which in turn causes the logic checking the use of the "Release Notes" label to assume that no release notes are added, removed, or modified by a given merge request. Fix by considering all types of file changes (modifications, additions, and removals - which also covers file renaming) when checking whether a given merge request modifies release notes. Update the warning messages accordingly. However, when trying to find release notes added by a given merge request, deleted files must not be considered. Tweak the logic looking for GitLab identifiers in the release notes added by a given merge request so that it only scans modified and added (or renamed) files. (cherry picked from commit 0fec404c64cf367b9c2d676535c50f228355b6b5) --- dangerfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dangerfile.py b/dangerfile.py index 2c1e7de14c..d3d3a8f4c6 100644 --- a/dangerfile.py +++ b/dangerfile.py @@ -347,18 +347,18 @@ if changes_added_lines: # MR. release_notes_regex = re.compile(r"doc/(arm|notes)/notes-.*\.(rst|xml)") -release_notes_changed = list(filter(release_notes_regex.match, modified_files)) +release_notes_changed = list(filter(release_notes_regex.match, affected_files)) release_notes_label_set = "Release Notes" in mr_labels if not release_notes_changed: if release_notes_label_set: fail( "This merge request has the *Release Notes* label set. " - "Add a release note or unset the *Release Notes* label." + "Update release notes or unset the *Release Notes* label." ) elif "Customer" in mr_labels: warn( "This merge request has the *Customer* label set. " - "Add a release note unless the changes introduced are trivial." + "Update release notes unless the changes introduced are trivial." ) if release_notes_changed and not release_notes_label_set: fail( @@ -367,7 +367,9 @@ if release_notes_changed and not release_notes_label_set: ) if release_notes_changed: - notes_added_lines = added_lines(target_branch, release_notes_changed) + modified_or_new_files = danger.git.modified_files + danger.git.created_files + release_notes_added = list(filter(release_notes_regex.match, modified_or_new_files)) + notes_added_lines = added_lines(target_branch, release_notes_added) 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.")