summary refs log tree commit diff
path: root/scripts-dev/release.py
diff options
context:
space:
mode:
authorDan Callahan <danc@element.io>2021-06-08 11:44:50 +0100
committerGitHub <noreply@github.com>2021-06-08 11:44:50 +0100
commit7dc14730d925a39a885a14ce309d99054f9617d5 (patch)
tree245c19599fdae8a9e832c3f88e92f8cb8a2d58da /scripts-dev/release.py
parentWhen joining a remote room limit the number of events we concurrently check s... (diff)
downloadsynapse-7dc14730d925a39a885a14ce309d99054f9617d5.tar.xz
Name release branches just after major.minor (#10013)
With the prior format, 1.33.0 / 1.33.1 / 1.33.2 got separate branches:

    release-v1.33.0
    release-v1.33.1
    release-v1.33.2

Under the new model, all three would share a common branch:

    release-v1.33

As before, RCs and actual releases exist as tags on these branches.

This better reflects our support model, e.g., that the "1.33" series had
a formal release followed by two patches / updates.

Signed-off-by: Dan Callahan <danc@element.io>
Diffstat (limited to '')
-rwxr-xr-xscripts-dev/release.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts-dev/release.py b/scripts-dev/release.py
index 1042fa48bc..fc3df9071c 100755
--- a/scripts-dev/release.py
+++ b/scripts-dev/release.py
@@ -139,7 +139,7 @@ def run():
         click.get_current_context().abort()
 
     # Switch to the release branch.
-    release_branch_name = f"release-v{base_version}"
+    release_branch_name = f"release-v{current_version.major}.{current_version.minor}"
     release_branch = find_ref(repo, release_branch_name)
     if release_branch:
         if release_branch.is_remote():