User: joe
Date: 07 Apr 26 19:17
Revision: 71d5ec375fd461e8f53dd772fcdbfa5da775552f
Summary:
Fix branch format in release script


TeamCity URL: http://ci.mcdev.io:80/viewModification.html?tab=vcsModificationFiles&modId=10483&personal=false

Index: create_release.py
===================================================================
--- create_release.py	(revision 65087fb216cc3b15c636c290a4e6989daf7bc750)
+++ create_release.py	(revision 71d5ec375fd461e8f53dd772fcdbfa5da775552f)
@@ -145,7 +145,7 @@
         sys.exit(1)
 
 def tag_and_push(branch: str, version: str, push: bool, dry_run: bool):
-    tag = f"{branch}-{version}"
+    tag = f"{version}-{branch}"
     # check tag does not already exist
     rc, _, _ = run_git(["rev-parse", "-q", "--verify", f"refs/tags/{tag}"])
     if rc == 0:
@@ -183,7 +183,7 @@
 
 def parse_args():
     p = argparse.ArgumentParser(description="Merge release branches and create/push tags non-interactively.")
-    p.add_argument("version", help="version string to append to tags (used as <branch>-<version>)")
+    p.add_argument("version", help="version string to append to tags (used as <version>-<branch>)")
     p.add_argument("--branches", nargs="+",
                    default=BRANCHES,
                    help="space-separated list of branches in order (default: %(default)s)")