prefix version tags with 'v'

this got lost with mitmproxy 9 somehow. the plan is to recreate those tags with 'v', and then keep using 'v' going forward.

CHANGELOG.md

@@ -7,6 +7,7 @@
 
 ## Unreleased: mitmproxy next
 
+* Release tags are now prefixed with `v` again to follow SemVer convention.
 
 
 ## 17 April 2024: mitmproxy 10.3.0

release/build-and-deploy-docker.py

@@ -19,7 +19,9 @@
 if ref.startswith("refs/heads/"):
     branch = ref.replace("refs/heads/", "")
 elif ref.startswith("refs/tags/"):
-    tag = ref.replace("refs/tags/", "")
+    if not ref.startswith("refs/tags/v"):
+        raise AssertionError(f"Unexpected tag: {ref}")
+    tag = ref.replace("refs/tags/v", "")
 else:
     raise AssertionError("Failed to parse $GITHUB_REF")
 

release/build.py

@@ -83,9 +83,18 @@ def archive(path: Path) -> tarfile.TarFile | ZipFile2:
 
 
 def version() -> str:
-    return os.environ.get("GITHUB_REF_NAME", "").replace("/", "-") or os.environ.get(
-        "BUILD_VERSION", "dev"
-    )
+    if ref := os.environ.get("GITHUB_REF", ""):
+        if ref.startswith("refs/tags/") and not ref.startswith("refs/tags/v"):
+            raise AssertionError(f"Unexpected tag: {ref}")
+        return (
+            ref
+                .removeprefix("refs/heads/")
+                .removeprefix("refs/pull/")
+                .removeprefix("refs/tags/v")
+                .replace("/", "-")
+        )
+    else:
+        return os.environ.get("BUILD_VERSION", "dev")
 
 
 def operating_system() -> str:

release/deploy.py

@@ -14,7 +14,9 @@
     if ref.startswith("refs/heads/"):
         branch = ref.replace("refs/heads/", "")
     elif ref.startswith("refs/tags/"):
-        tag = ref.replace("refs/tags/", "")
+        if not ref.startswith("refs/tags/v"):
+            raise AssertionError(f"Unexpected tag: {ref}")
+        tag = ref.replace("refs/tags/v", "")
     else:
         raise AssertionError
 

release/release.py

@@ -99,7 +99,8 @@ def get_json(url: str) -> dict:
     subprocess.run(
         ["git", "commit", "-a", "-m", f"mitmproxy {version}"], cwd=root, check=True
     )
-    subprocess.run(["git", "tag", version], cwd=root, check=True)
+    tag_name = f"v{version}"
+    subprocess.run(["git", "tag", tag_name], cwd=root, check=True)
     release_sha = subprocess.run(
         ["git", "rev-parse", "HEAD"],
         cwd=root,
@@ -124,7 +125,7 @@ def get_json(url: str) -> dict:
 
     print("➡️ Pushing...")
     subprocess.run(
-        ["git", "push", "--atomic", "origin", branch, version], cwd=root, check=True
+        ["git", "push", "--atomic", "origin", branch, tag_name], cwd=root, check=True
     )
 
     print("➡️ Creating release on GitHub...")
@@ -133,7 +134,7 @@ def get_json(url: str) -> dict:
             "gh",
             "release",
             "create",
-            version,
+            tag_name,
             "--title",
             f"mitmproxy {version}",
             "--notes-file",
@@ -145,7 +146,7 @@ def get_json(url: str) -> dict:
 
     print("➡️ Dispatching release workflow...")
     subprocess.run(
-        ["gh", "workflow", "run", "main.yml", "--ref", version], cwd=root, check=True
+        ["gh", "workflow", "run", "main.yml", "--ref", tag_name], cwd=root, check=True
     )
 
     print("")