feat: Collapse RC changelogs when a production release exists.

- Filter out RC tags in `git.release_tags` if a production tag exists
  for that version.
- Pass the production flag to `update_changelog` in `validate_pr` and
  `create_release`.

Author: iphydf

CHANGELOG.md

@@ -9,17 +9,6 @@ Full release of ci-tools for testing the production release workflows.
 #### Bug Fixes
 
 - Improve release progress tracking and publication links. ([a00ac1b3](https://github.com/TokTok/ci-tools/commit/a00ac1b3848043c8da83a89b70e190dbd4929d58))
-
-<a name="v0.8.3-rc.1"></a>
-
-## v0.8.3-rc.1 (2026-02-06)
-
-### Release notes
-
-Some pre-release notes here.
-
-#### Bug Fixes
-
 - Don't crash the todo list update when there are no releases. ([34d2d3a9](https://github.com/TokTok/ci-tools/commit/34d2d3a967620c66a0dbe76205d35042f343209f))
 - Correct the path prefixes in release tarballs. ([f69e34f8](https://github.com/TokTok/ci-tools/commit/f69e34f8f54cffcc3b20176b8da4f9021a0797ac))
 - Add missing python dependencies in the slim image. ([299d574c](https://github.com/TokTok/ci-tools/commit/299d574c96e54645a4376a519ee2d3d696fba8e0))
@@ -73,18 +62,6 @@ Prod release for ci-tools.
 - Run release-soon on everything except push. ([8d52ffa9](https://github.com/TokTok/ci-tools/commit/8d52ffa94e12cc23075fde7d19ae86a10fa91c2b))
 - Don't run release-soon check on pushes, only pulls. ([138a61e8](https://github.com/TokTok/ci-tools/commit/138a61e8e66b874849a5e5d82c2607280376c664))
 - Output a zero-length file when changelog is empty. ([2337240f](https://github.com/TokTok/ci-tools/commit/2337240fb4840361a1c085b6c91476c3f9c27b43))
-- **Security:** Don't pass tokens to repo-local code. ([887ba6cf](https://github.com/TokTok/ci-tools/commit/887ba6cf826e0c43013d90e421047a85b17bd75a))
-
-<a name="v0.8.1-rc.1"></a>
-
-## v0.8.1-rc.1 (2025-02-16)
-
-### Release notes
-
-First release of ci-tools made by ci-tools releaser scripts. Release candidate first.
-
-#### Bug Fixes
-
 - Reviewable config was broken. ([73df8058](https://github.com/TokTok/ci-tools/commit/73df8058eaa6bb34a05411e50b27039447355dc5))
 - Forcibly trigger CI on automation pull requests. ([4bcdf84b](https://github.com/TokTok/ci-tools/commit/4bcdf84b4bbc9e23c3a5d9fb89cce3a50b8be373))
 - Fix self-name detection for real now. ([782a44c9](https://github.com/TokTok/ci-tools/commit/782a44c9cf025a042e6c301ea1bd55a412dc2616))
@@ -114,6 +91,7 @@ First release of ci-tools made by ci-tools releaser scripts. Release candidate f
 - Don't evaluate BUILD.bazel. ([cdc378fd](https://github.com/TokTok/ci-tools/commit/cdc378fd2bbcb636db0a331e03bf0585b2339ea4))
 - Fail the `hackage_upload` script on upload failure. ([0c2126d6](https://github.com/TokTok/ci-tools/commit/0c2126d6a22f551c6430def25d1da327ab628ecc))
 - Fix hackage upload URL for package candidates. ([563e21cd](https://github.com/TokTok/ci-tools/commit/563e21cdcf71f5719d370e21f880a5d89b9a4a52))
+- **Security:** Don't pass tokens to repo-local code. ([887ba6cf](https://github.com/TokTok/ci-tools/commit/887ba6cf826e0c43013d90e421047a85b17bd75a))
 
 #### Features
 

tools/create_release.py

@@ -399,7 +399,12 @@ def stage_gitignore(self) -> None:
             s.ok(f"Added '{path.strip()}' to {gitignore}")
 
     def stage_validate(self) -> None:
-        validate_pr.main(validate_pr.Config(commit=not self.config.verify))
+        validate_pr.main(
+            validate_pr.Config(
+                commit=not self.config.verify,
+                release=self.config.production,
+            )
+        )
 
     def extract_issue_release_notes(self, body: str) -> str:
         """Extract the release notes from the issue body."""

tools/lib/git.py

@@ -149,16 +149,22 @@ def current_branch(self) -> str:
 
     def release_tags(self, with_rc: bool = True) -> list[str]:
         tags = self._run_output(["tag", "--merged"]).splitlines()
-        return sorted(
-            (
-                tag
-                for tag in tags
-                if re.match(VERSION_REGEX, tag) and (with_rc or "-rc." not in tag)
-            ),
+        all_tags = sorted(
+            (tag for tag in tags if re.match(VERSION_REGEX, tag)),
             reverse=True,
             key=parse_version,
         )
 
+        if not with_rc:
+            return [t for t in all_tags if "-rc." not in t]
+
+        prod_versions = {t for t in all_tags if "-rc." not in t}
+        return [
+            t
+            for t in all_tags
+            if "-rc." not in t or t.split("-rc.")[0] not in prod_versions
+        ]
+
     def release_tag_exists(self, tag: str) -> bool:
         """Check if a tag exists."""
         return tag in self.release_tags()

tools/lib/git_test.py

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Copyright © 2026 The TokTok team
 import unittest
+import unittest.mock
 
 from lib import git
 
@@ -30,5 +31,28 @@ def test_comparison(self) -> None:
         self.assertNotEqual(git.parse_version("v1.2.3"), git.parse_version("v1.2.4"))
 
 
+class TestReleaseTags(unittest.TestCase):
+    def test_release_tags_filtering(self) -> None:
+        g = git.Git()
+        g._run_output = unittest.mock.MagicMock(  # type: ignore
+            return_value="v1.0.0\nv1.0.0-rc.1\nv1.0.0-rc.2\nv0.9.0"
+        )
+
+        # Desired behavior: v1.0.0-rc.1 and v1.0.0-rc.2 should be filtered because v1.0.0 exists
+        tags = g.release_tags(with_rc=True)
+        self.assertNotIn("v1.0.0-rc.1", tags)
+        self.assertNotIn("v1.0.0-rc.2", tags)
+        self.assertIn("v1.0.0", tags)
+        self.assertIn("v0.9.0", tags)
+
+        # RC only version should still show RCs
+        g._run_output = unittest.mock.MagicMock(  # type: ignore
+            return_value="v1.1.0-rc.1\nv1.0.0"
+        )
+        tags = g.release_tags(with_rc=True)
+        self.assertIn("v1.1.0-rc.1", tags)
+        self.assertIn("v1.0.0", tags)
+
+
 if __name__ == "__main__":
     unittest.main()

tools/validate_pr.py

@@ -288,7 +288,13 @@ def check_changelog(failures: list[str], config: Config) -> None:
     with stage.Stage(
         "Changelog", "The changelog should be up-to-date", failures
     ) as check:
-        update_changelog.main()
+        clog_config = update_changelog.parse_config(update_changelog.read_clog_toml())
+        if config.release:
+            clog_config.production = True
+        elif re.match(git.RELEASE_BRANCH_REGEX, github.head_ref()):
+            clog_config.production = "-rc." not in github.head_ref()
+
+        update_changelog.main(clog_config)
         if has_diff(config, "CHANGELOG.md"):
             if config.commit:
                 git.add("CHANGELOG.md")

tools/validate_pr_test.py

@@ -1,9 +1,52 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 # Copyright © 2026 The TokTok team
 import unittest
+import unittest.mock
 
-from validate_pr import (parse_toxcore_version, parse_version_diff,
-                         parse_weblate_prs)
+from validate_pr import (Config, check_changelog, parse_toxcore_version,
+                         parse_version_diff, parse_weblate_prs)
+
+
+class TestCheckChangelog(unittest.TestCase):
+    @unittest.mock.patch("update_changelog.main")
+    @unittest.mock.patch("update_changelog.read_clog_toml", return_value={})
+    @unittest.mock.patch("update_changelog.parse_config")
+    @unittest.mock.patch("validate_pr.github.head_ref")
+    @unittest.mock.patch("validate_pr.has_diff", return_value=False)
+    @unittest.mock.patch("validate_pr.stage.Stage")
+    def test_check_changelog_production(
+        self,
+        mock_stage: unittest.mock.MagicMock,
+        mock_has_diff: unittest.mock.MagicMock,
+        mock_head_ref: unittest.mock.MagicMock,
+        mock_parse_config: unittest.mock.MagicMock,
+        mock_read_clog_toml: unittest.mock.MagicMock,
+        mock_clog_main: unittest.mock.MagicMock,
+    ) -> None:
+        clog_config = unittest.mock.MagicMock()
+        clog_config.production = False
+        mock_parse_config.return_value = clog_config
+
+        # 1. Release config set to True
+        mock_head_ref.return_value = "some-branch"
+        config = Config(commit=False, release=True)
+        check_changelog([], config)
+        self.assertTrue(clog_config.production)
+        mock_clog_main.assert_called_with(clog_config)
+
+        # 2. Release config False, but branch is a production release branch
+        clog_config.production = False
+        mock_head_ref.return_value = "release/v1.0.0"
+        config = Config(commit=False, release=False)
+        check_changelog([], config)
+        self.assertTrue(clog_config.production)
+
+        # 3. Release config False, branch is an RC release branch
+        clog_config.production = False
+        mock_head_ref.return_value = "release/v1.0.0-rc.1"
+        config = Config(commit=False, release=False)
+        check_changelog([], config)
+        self.assertFalse(clog_config.production)
 
 
 class TestValidatePRLogic(unittest.TestCase):