Skip to content

Commit a0374f3

Browse files
authored
Merge pull request #59 from jackye1995/fix-release-notes
fix: support merge commit format in release notes PR extraction
2 parents 27fab35 + 8517f21 commit a0374f3

1 file changed

Lines changed: 13 additions & 1 deletion

File tree

ci/generate_release_notes.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,22 @@ def get_commits_between_tags(previous_tag: str, current_tag: str) -> list[str]:
7777

7878

7979
def extract_pr_number(commit_message: str) -> int | None:
80-
"""Extract PR number from commit message like 'fix: something (#1234)'."""
80+
"""Extract PR number from commit message.
81+
82+
Supports formats:
83+
- 'fix: something (#1234)' - squash merge format
84+
- 'Merge pull request #1234 from ...' - merge commit format
85+
"""
86+
# Try squash merge format first: (#1234)
8187
match = re.search(r"\(#(\d+)\)", commit_message)
8288
if match:
8389
return int(match.group(1))
90+
91+
# Try merge commit format: Merge pull request #1234
92+
match = re.search(r"Merge pull request #(\d+)", commit_message)
93+
if match:
94+
return int(match.group(1))
95+
8496
return None
8597

8698

0 commit comments

Comments
 (0)