Merge pull request #2 from redis-developer/fix-tag-resolution

Fix tag parsing for milestone tags

Author: adobrzhansky

src/redis_release/orchestrator.py

@@ -1,5 +1,5 @@
 """Main orchestration logic for Redis release automation."""
-
+import re
 from dataclasses import dataclass
 from typing import Optional
 
@@ -11,7 +11,6 @@
     PackageType,
     ReleaseState,
     ReleaseType,
-    WorkflowConclusion,
     WorkflowRun,
 )
 from .state_manager import StateManager
@@ -94,13 +93,14 @@ def _get_docker_branch(self, tag: str) -> str:
         Returns:
             Branch name to use for workflow trigger
         """
-        # extract major.minor version from tag
+        # Extract major.minor version from tag
         # examples: "8.2.1" -> "8.2", "8.4-m01" -> "8.4"
-        if "." in tag:
-            parts = tag.split(".")
-            if len(parts) >= 2:
-                major_minor = f"{parts[0]}.{parts[1]}"
-                return f"release/{major_minor}"
+        match = re.match(r"^(\d+)\.(\d+)", tag)
+        if match:
+            major = match.group(1)
+            minor = match.group(2)
+            major_minor = f"{major}.{minor}"
+            return f"release/{major_minor}"
 
         console.print(
             f"[yellow]Warning: Could not determine branch for tag '{tag}', using 'main'[/yellow]"
@@ -219,7 +219,7 @@ def execute_release(
                 self._print_completed_state_phase(
                     phase_completed=docker_state.build_completed if docker_state else False,
                     workflow=docker_state.build_workflow if docker_state else None,
-                    name="Build"
+                    name="Build",
                 )
 
             state_manager.save_state(state)
@@ -236,7 +236,7 @@ def execute_release(
                 self._print_completed_state_phase(
                     phase_completed=docker_state.publish_completed if docker_state else False,
                     workflow=docker_state.publish_workflow if docker_state else None,
-                    name="Publish"
+                    name="Publish",
                 )
 
             state_manager.save_state(state)
@@ -315,7 +315,7 @@ def _execute_build_phase(
             state=state,
             repo=repo,
             orchestrator_config=self.docker_config,
-            timeout_minutes=45
+            timeout_minutes=45,
         )
 
         executor = PhaseExecutor()
@@ -338,7 +338,7 @@ def _execute_publish_phase(
             state=state,
             repo=repo,
             orchestrator_config=self.docker_config,
-            timeout_minutes=30  # Publish might be faster than build
+            timeout_minutes=30,  # Publish might be faster than build
         )
 
         executor = PhaseExecutor()

src/redis_release/workflow_executor.py

@@ -1,12 +1,19 @@
 """Workflow execution classes for Redis release automation."""
+import re
 import json
 from abc import ABC, abstractmethod
 from typing import Any, Dict, Optional
 
 from rich.console import Console
 
 from .github_client import GitHubClient
-from .models import PackageState, PackageType, ReleaseState, WorkflowConclusion, WorkflowRun
+from .models import (
+    PackageState,
+    PackageType,
+    ReleaseState,
+    WorkflowConclusion,
+    WorkflowRun,
+)
 
 console = Console()
 
@@ -19,7 +26,7 @@ def __init__(
         state: ReleaseState,
         repo: str,
         orchestrator_config: Dict[str, Any],
-        timeout_minutes: int = 45
+        timeout_minutes: int = 45,
     ):
         self.state = state
         self.repo = repo
@@ -94,26 +101,25 @@ def extract_result(self, github_client: GitHubClient, artifacts: Dict[str, Dict[
     def _get_release_branch(self) -> str:
         """Get the release branch based on the release tag.
 
-        Extracts major.minor from tag (e.g., "8.2.1" -> "release/8.2").
+        Extracts major.minor from tag (e.g., "8.2.1" -> "release/8.2", "8.4-m01-int" -> "release/8.4").
 
         Returns:
             Release branch name
 
         Raises:
             ValueError: If tag format is invalid
         """
-        tag_parts = self.state.tag.split(".")
-        if len(tag_parts) < 2:
-            raise ValueError(f"Invalid tag format '{self.state.tag}': expected at least major.minor version")
-
-        try:
-            # Validate that major and minor are numeric
-            int(tag_parts[0])
-            int(tag_parts[1])
-        except ValueError:
-            raise ValueError(f"Invalid tag format '{self.state.tag}': major and minor versions must be numeric")
+        # Extract major.minor version from the beginning of the tag
+        # This handles both "8.2.1" and "8.4-m01-int" formats
+        match = re.match(r"^(\d+)\.(\d+)", self.state.tag)
+        if not match:
+            raise ValueError(
+                f"Invalid tag format '{self.state.tag}': expected tag to start with major.minor version (e.g., '8.2.1' or '8.4-m01')"
+            )
 
-        major_minor = f"{tag_parts[0]}.{tag_parts[1]}"
+        major = match.group(1)
+        minor = match.group(2)
+        major_minor = f"{major}.{minor}"
         return f"release/{major_minor}"