Skip to content

fix: ignore dependencies versions bump when parsing version from commit logs #472

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

Closed
wants to merge 5 commits into from
Closed

fix: ignore dependencies versions bump when parsing version from commit logs #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e9a9bc
test: reproduce bug in version parsing from commit logs
browniebroke Jul 14, 2022
fb57492
fix: ignore dependencies versions bump when parsing version from comm…
browniebroke Jul 14, 2022
65c7968
fix: accept versions with 'v' as prefix
browniebroke Jul 14, 2022
f1fa070
fix: return only captured group to exclude 'v' prefix
browniebroke Jul 14, 2022
c25c57e
test: add missing groups to regexes
browniebroke Jul 14, 2022
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
4 changes: 2 additions & 2 deletions semantic_release/history/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

prerelease_pattern = f"-{config.get('prerelease_tag')}\.\d+"
version_pattern = f"(\d+\.\d+\.\d+({prerelease_pattern})?)"
release_version_pattern = f"(\d+\.\d+\.\d+(?!.*{prerelease_pattern}))"
release_version_pattern = f"v?(\d+\.\d+\.\d+(?!.*{prerelease_pattern}))"

release_version_regex = rf"{release_version_pattern}"
version_regex = rf"{version_pattern}"
Expand Down Expand Up @@ -388,7 +388,7 @@ def get_current_release_version_by_commits() -> str:
"""
for commit_hash, commit_message in get_commit_log():
logger.debug(f"Checking commit {commit_hash}")
match = re.search(rf"{release_version_pattern}", commit_message)
match = re.match(rf"{release_version_pattern}", commit_message)
if match:
logger.debug(f"Version matches regex {commit_message}")
return match.group(1).strip()
Expand Down
2 changes: 1 addition & 1 deletion semantic_release/vcs_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def version_finder(tag):

match = re.search(rf"{pattern}", i.name)
if match:
return match.group(0).strip()
return match.group(1).strip()

return None

Expand Down
11 changes: 11 additions & 0 deletions tests/history/test_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,17 @@ def test_should_return_correct_version_from_large_prerelease(self):
def test_should_return_correct_version_without_prerelease(self):
assert get_current_release_version_by_commits() == "7.28.0"

@mock.patch(
"semantic_release.history.get_commit_log",
lambda: [
("211", "chore(deps): bump some-deps to 0.6.0"),
("13", "fix(deps): bump other-deps to 1.2.3"),
("13", "8.9.2"),
],
)
def test_should_ignore_deps_version_bump(self):
assert get_current_release_version_by_commits() == "8.9.2"


class TestGetNewVersion:
def test_major_bump(self):
Expand Down
6 changes: 3 additions & 3 deletions tests/test_vcs_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,9 +359,9 @@ def test_checkout_should_checkout_correct_branch(mock_git):
@pytest.mark.parametrize(
"pattern, skip_tags,expected_result",
[
("\d+.\d+.\d+", None, "2.0.0"),
("\d+.\d+.\d+", ["v2.0.0"], "1.1.0"),
("\d+.\d+.\d+", ["v0.1.0", "v1.0.0", "v1.1.0", "v2.0.0"], None),
("(\d+.\d+.\d+)", None, "2.0.0"),
("(\d+.\d+.\d+)", ["v2.0.0"], "1.1.0"),
("(\d+.\d+.\d+)", ["v0.1.0", "v1.0.0", "v1.1.0", "v2.0.0"], None),
],
)
def test_get_last_version(pattern, skip_tags, expected_result):
Expand Down