diff --git a/.github/scripts/changelog_guard_mutate.py b/.github/scripts/changelog_guard_mutate.py index 82fb79d..8b7f79b 100644 --- a/.github/scripts/changelog_guard_mutate.py +++ b/.github/scripts/changelog_guard_mutate.py @@ -48,6 +48,8 @@ ("a PR with no check job gets a warning", ' return f"#{n}: no {JOB} job on', ' return None\n return f"#{n}: no {JOB} job on'), ("a failure on one PR doesn't stop the loop", " except (CmdError, KeyError, ValueError) as e:\n warns.append", " except ZeroDivisionError as e:\n warns.append"), ("modes exit 0 when listing fails", " except (CmdError, KeyError, ValueError) as e:\n return report", " except ZeroDivisionError as e:\n return report"), + ("override warning retains changed-line details", 'f"{label}: {h} (allowed by the {OVERRIDE} label)"', + "f\"{label}: {h.split(':')[0]} (allowed by the {OVERRIDE} label)\""), # Regexes ("H3 strips trailing space", 'H3 = re.compile(r"^### +(.+?)\\s*$")', 'H3 = re.compile(r"^### +(.+)$")'), ("BULLET is top-level only", 'BULLET = re.compile(r"^[-*+]\\s+(.*\\S)")', 'BULLET = re.compile(r"^\\s*[-*+]\\s+(.*\\S)")'), diff --git a/.github/scripts/changelog_guard_test.py b/.github/scripts/changelog_guard_test.py index e3eec99..90ece02 100644 --- a/.github/scripts/changelog_guard_test.py +++ b/.github/scripts/changelog_guard_test.py @@ -236,7 +236,12 @@ def test_released_edit_fails_and_label_overrides(self): self.f.get(1)["labels"] = ["other", "changelog-override"] p = self.f.run("pr", 1) self.assertPass(p) - self.assertIn("::warning", p.stdout) + self.assertTrue(any( + line.startswith("::warning title=changelog-guard::") + and "changes released section [1.0.0]" in line + and "`- First release`" in line + and "(allowed by the changelog-override label)" in line + for line in p.stdout.splitlines()), p.stdout) def test_label_does_not_clear_other_errors(self): self.f.pr(1, add_unreleased("- Existing fix", base=BASE_CL.replace("- First release", "- First")), @@ -253,8 +258,12 @@ def test_deleted_changelog_fails_and_label_overrides(self): self.f.get(1)["labels"] = ["changelog-override"] p = self.f.run("pr", 1) self.assertPass(p) - self.assertIn("::warning", p.stdout) - self.assertIn("changes released section [1.0.0]", p.stdout) + self.assertTrue(any( + line.startswith("::warning title=changelog-guard::") + and "changes released section [1.0.0]" in line + and "`- First release`" in line + and "(allowed by the changelog-override label)" in line + for line in p.stdout.splitlines()), p.stdout) def test_empty_changelog_fails(self): self.f.pr(1, "")