From f61950d54d815b1c11f447bc740a2a2e4f59b522 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Fri, 31 Jul 2026 13:58:20 -0500 Subject: [PATCH] Fix release announcement to link to correct release branch of changelog (#20023) Without this change, it was linking to `develop` as we were on the `develop` branch because of the previous `merge-back` step at this point in the release process. Follow-up to https://github.com/element-hq/synapse/pull/19984 as this was an oversight and I assumed we would still be on the `release-v1.158` branch by that point. --- changelog.d/20023.misc | 1 + scripts-dev/release.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/20023.misc diff --git a/changelog.d/20023.misc b/changelog.d/20023.misc new file mode 100644 index 0000000000..17dd927536 --- /dev/null +++ b/changelog.d/20023.misc @@ -0,0 +1 @@ +Fix release script announcement to link to correct release branch of changelog. diff --git a/scripts-dev/release.py b/scripts-dev/release.py index 37fd560123..f78c2c0ab0 100755 --- a/scripts-dev/release.py +++ b/scripts-dev/release.py @@ -736,8 +736,8 @@ def announce(_gh_token: str | None) -> None: def _announce() -> None: """Generate markdown to announce the release.""" - synapse_repo = get_repo_and_check_clean_checkout() current_version = get_package_version() + release_branch_name = get_release_branch_name(current_version) tag_name = f"v{current_version}" is_rc = "rc" in tag_name @@ -756,7 +756,7 @@ Hi everyone. Synapse {current_version} has just been released. ) release_text += f""" -[notes](https://github.com/element-hq/synapse/blob/{synapse_repo.active_branch.name}/CHANGES.md) | \ +[notes](https://github.com/element-hq/synapse/blob/{release_branch_name}/CHANGES.md) | \ [docker](https://hub.docker.com/r/matrixdotorg/synapse/tags?name={tag_name}) | \ [debs](https://packages.matrix.org/debian/) | \ [pypi](https://pypi.org/project/matrix-synapse/{current_version}/)"""