oblachno-oss/devx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DEVX-54: fix: squash-merge format uses space not colon after task ID

Browse Source
This commit is contained in:
emil
2026-06-25 21:51:36 +00:00
parent 3e4dfcadb7
commit faff67aa6a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/devx/ci/auto_merge.py
+2 -2
View File
@@ -226,12 +226,12 @@ def main(branch: str, pr_title: str, repo: str, pr_number: str) -> None:
validate_pr_title(pr_title, task_id) validate_pr_title(pr_title, task_id)
validate_pr_title_matches_vikunja(pr_title, task_id) validate_pr_title_matches_vikunja(pr_title, task_id)
# Build merge title: DEVX-N: <conventional commit message> # Build merge title: DEVX-N <conventional commit message> (space-separated, no colon)
commits = client.get_pr_commits(pr_num) commits = client.get_pr_commits(pr_num)
conv_msg = extract_conventional_msg(commits) conv_msg = extract_conventional_msg(commits)
if not conv_msg: if not conv_msg:
raise click.ClickException(_("Could not extract conventional commit message from PR commits.")) raise click.ClickException(_("Could not extract conventional commit message from PR commits."))
merge_title = f"{task_id}: {conv_msg}" merge_title = f"{task_id} {conv_msg}"
try: try:
client.merge_pr(pr_num, merge_title) client.merge_pr(pr_num, merge_title)
tests/unit/test_auto_merge.py
+1 -1
View File
@@ -221,7 +221,7 @@ class TestMain:
["DEVX-19-fix-bug", "DEVX-19: Fix timeout", "owner/repo", "7"], ["DEVX-19-fix-bug", "DEVX-19: Fix timeout", "owner/repo", "7"],
) )
assert result.exit_code == 0, result.output assert result.exit_code == 0, result.output
mock_client.merge_pr.assert_called_once_with(7, "DEVX-19: fix: resolve timeout") mock_client.merge_pr.assert_called_once_with(7, "DEVX-19 fix: resolve timeout")
@patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True) @patch.dict("os.environ", {"REPO_TOKEN": ""}, clear=True)
def test_no_token_raises(self) -> None: def test_no_token_raises(self) -> None: