Skip to content

fix!: no-bump-message now takes precedence over *-version-bump-message. #3202

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.

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
merged 1 commit into from
Sep 26, 2022

Conversation

jeanplevesque
Copy link
Contributor

@jeanplevesque jeanplevesque commented Sep 22, 2022

Description

This PR changes the behavior of commit-message-incrementing when using commits that matches both *-version-bump-message and no-bump-message. no-bump-message now takes precedence over *-version-bump-message.

Previous Behavior

Commits that match both *-version-bump-message and no-bump-message use the highest increment associated with *-version-bump-message.

New Behavior

Commits that match both *-version-bump-message and no-bump-message don't have an increment.

Related Issue

Resolves #3172.

Motivation and Context

Repositories that enforce conventional commits along with commit-message-incrementing (with a config like this) can now have commits that don't have version bumps.

Example:

chore: Adjust .editorconfig for coding convention.
+semver: skip

How Has This Been Tested?

An integration test was added to ensure the new behavior is covered by tests.
The newly added test fails when reverting the changes.

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Copy link
Member

@asbjornu asbjornu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@jeanplevesque jeanplevesque force-pushed the no-bump-message-priority branch from 9baadce to 99692fa Compare September 23, 2022 19:37
Copy link
Member

@asbjornu asbjornu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you feel like this is ready for review now, @jeanplevesque?

@jeanplevesque jeanplevesque marked this pull request as ready for review September 23, 2022 22:07
@jeanplevesque
Copy link
Contributor Author

Do you feel like this is ready for review now, @jeanplevesque?

Yep! 😀

@asbjornu asbjornu merged commit b013d24 into GitTools:main Sep 26, 2022
@mergify
Copy link
Contributor

mergify bot commented Sep 26, 2022

Thank you @jeanplevesque for your contribution!

@jeanplevesque jeanplevesque deleted the no-bump-message-priority branch September 26, 2022 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

no-bump-message should take precedence over *-version-bump-message
2 participants