From 22092526e799c6d639960bd92ce5566d5fef2a44 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Tue, 28 Feb 2023 18:35:33 +0000 Subject: [PATCH] Do not delete news fragments(changelog files) on pre-releases. Signed-off-by: Pedro Algarvio --- tools/changelog.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/changelog.py b/tools/changelog.py index 770ab435005..10c46ce3ac6 100644 --- a/tools/changelog.py +++ b/tools/changelog.py @@ -365,8 +365,10 @@ def generate_changelog_md(ctx: Context, salt_version: Version, draft: bool = Fal salt_version = _get_salt_version(ctx) cmd = ["towncrier", "build", f"--version={salt_version}"] if draft: - cmd += ["--draft"] + cmd.append("--draft") + elif salt_version.is_prerelease: + cmd.append("--keep") else: - cmd += ["--yes"] + cmd.append("--yes") ctx.run(*cmd, check=True) ctx.run("git", "restore", "--staged", "CHANGELOG.md", "changelog/", check=True)