Determine backport branch based on version not update_from_version

This allows switching backport branch without requiring a published release for the version. This patch also bumps version to 2.19.0-dev so 2.18.x becomes the new backport target.
timescale · Jan 20, 2025 · 954f220 · 954f220
1 parent 6f2aa30
commit 954f220
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/scripts/backport.py b/scripts/backport.py
@@ -196,10 +196,11 @@ def git_returncode(command):
     ]
 )
 
-previous_version = version_config["update_from_version"]
-previous_version_parts = previous_version.split(".")
-previous_version_parts[-1] = "x"
-backport_target = ".".join(previous_version_parts)
+version = version_config["version"].split("-")
+version_parts = version.split(".")
+version_parts[1] = str(int(version_parts[1]) - 1)
+version_parts[2] = "x"
+backport_target = ".".join(version_parts)
 backported_label = f"backported-{backport_target}"
 
 print(f"Will backport to {backport_target}.")

diff --git a/version.config b/version.config
@@ -1,3 +1,3 @@
-version = 2.18.0-dev
+version = 2.19.0-dev
 update_from_version = 2.17.2
 downgrade_to_version = 2.17.2