Skip to content

fix: don't use commit_subject for tag pattern matching #480

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danth merged 1 commit into from
Jul 25, 2022
Merged

fix: don't use commit_subject for tag pattern matching #480

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions semantic_release/history/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,15 @@ def get_pattern_with_commit_subject(pattern):

def get_version_pattern():
prerelease_pattern = get_prerelease_pattern()
return get_pattern_with_commit_subject(f"(\d+\.\d+\.\d+({prerelease_pattern})?)")
return f"(\d+\.\d+\.\d+({prerelease_pattern})?)"


def get_release_version_pattern():
prerelease_pattern = get_prerelease_pattern()
return f"v?(\d+\.\d+\.\d+(?!.*{prerelease_pattern}))"


def get_commit_release_version_pattern():
prerelease_pattern = get_prerelease_pattern()
return get_pattern_with_commit_subject(
f"v?(\d+\.\d+\.\d+(?!.*{prerelease_pattern}))"
Expand Down Expand Up @@ -376,7 +381,7 @@ def get_previous_release_version(version: str) -> Optional[str]:
:param version: A string with the version number.
:return: A string with the previous version number.
"""
release_version_pattern = get_release_version_pattern()
release_version_pattern = get_commit_release_version_pattern()

found_version = False
for commit_hash, commit_message in get_commit_log():
Expand Down Expand Up @@ -404,7 +409,7 @@ def get_current_release_version_by_commits() -> str:

:return: A string with the current version number.
"""
release_version_re = re.compile(get_release_version_pattern())
release_version_re = re.compile(get_commit_release_version_pattern())

for commit_hash, commit_message in get_commit_log():
logger.debug(f"Checking commit {commit_hash}")
Expand Down