Skip to content
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

Add support for Squash Commit releases #3984

Merged
merged 2 commits into from
Apr 3, 2024

Conversation

DSpirit
Copy link
Contributor

@DSpirit DSpirit commented Mar 29, 2024

Extended the TryParse operation to check whether the commit source branch is a release branch in order to support increment of merges from release into main branch when a squash merge has been applied.

Motivation and Context

Discussion

How Has This Been Tested?

  • Local tests with only one merge commit worked
  • Extended the MergeMessageBaseVersionStrategyTests.cs with a test using the false flag on IsMergeCommit

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.

@DSpirit DSpirit mentioned this pull request Mar 29, 2024
5 tasks
@DSpirit
Copy link
Contributor Author

DSpirit commented Mar 29, 2024

@asbjornu I've created a clean PR due to merge conflicts.
Here I've fixed the failing hotfix tests and applied the changes you've requested. Would be glad if you could take another look!

@arturcic arturcic requested a review from asbjornu March 29, 2024 19:47
src/GitVersion.Core/MergeMessage.cs Outdated Show resolved Hide resolved
@DSpirit DSpirit requested a review from asbjornu March 30, 2024 08:56
@arturcic arturcic added this to the 6.x milestone Mar 30, 2024
@asbjornu asbjornu merged commit e565215 into GitTools:main Apr 3, 2024
134 checks passed
Copy link
Contributor

mergify bot commented Apr 3, 2024

Thank you @DSpirit for your contribution!

@DSpirit DSpirit deleted the feature/merge-squash-releases branch April 4, 2024 07:10
@arturcic arturcic modified the milestones: 6.x, 6.0.0-rc.1 May 23, 2024
@arturcic
Copy link
Member

🎉 This issue has been resolved in version 6.0.0-rc.1 🎉
The release is available on:

Your GitReleaseManager bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants