[SPARK-51493] Refine merge_spark_pr.py to use connect-swift-x.y.z version

dongjoon-hyun · dongjoon-hyun · commit 7618beac429f · 2025-03-12T12:24:29.000-07:00
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
@@ -311,7 +311,9 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
     versions = [
         x
         for x in versions
-        if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
+        if not x.raw["released"]
+        and not x.raw["archived"]
+        and re.match(r"connect-swift-\d+\.\d+\.\d+", x.name)
     ]
     versions = sorted(versions, key=lambda x: x.name, reverse=True)
 

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,9 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):`
`311`	`311`	`versions = [`
`312`	`312`	`x`
`313`	`313`	`for x in versions`
`314`		`- if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)`
	`314`	`+ if not x.raw["released"]`
	`315`	`+ and not x.raw["archived"]`
	`316`	`+ and re.match(r"connect-swift-\d+\.\d+\.\d+", x.name)`
`315`	`317`	`]`
`316`	`318`	`versions = sorted(versions, key=lambda x: x.name, reverse=True)`
`317`	`319`