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

MSR does not detect Merge Request conventional commit messages #20

Closed
ghost opened this issue Jul 14, 2020 · 11 comments
Closed

MSR does not detect Merge Request conventional commit messages #20

ghost opened this issue Jul 14, 2020 · 11 comments
Labels
bug Something isn't working question Further information is requested released

Comments

@ghost
Copy link

ghost commented Jul 14, 2020

Hi

When adding conventional commit messages to a merge request commits, the multi-semantic-release does not seem to detect these commit so it doesn't bump the version nor does it write a changelog.

Is this an expected behaviour or am I doing something wrong?

Please let me know if you require more elaboration.

@antongolub
Copy link
Collaborator

Hi, @musaabal-okaidi

Does this issue look like your case? semantic-release/commit-analyzer#65

@antongolub antongolub added the question Further information is requested label Jul 14, 2020
@ghost
Copy link
Author

ghost commented Jul 14, 2020

Hi @dhoulb

Not quite.

I'm writing commit messages that are compliant with the conventional commits guidelines, and these messages are correctly parsed and included in the changelog when I run semantic-release

However; my repo is a monorepo, hence I'm using multi-semantic-release and when using multi-semantic-release those merge commits are detected as changes to my monorepo packages.

Would you like an example repo to demonstrate this or does that make sense?

N.B It's worth noting that we're loosely following a Git Flow approach. So our process is:
A) Branch off develop to work on a new feature. (commit as much as you like without using conventional commit messages)
B) When the feature is complete, merge to develop using a conventional commit message (to allow that feature to be included i the changelog)
C) When we're ready for a prod release, we'll merge develop to master and run tagging/versioning (using semantic-release/multi-semantic-release

@antongolub
Copy link
Collaborator

Reproduced: builds#175591927
We'll try to fix it.

@antongolub antongolub added the bug Something isn't working label Jul 14, 2020
@antongolub antongolub reopened this Jul 14, 2020
@dhoulb
Copy link
Owner

dhoulb commented Jul 14, 2020

🎉 This issue has been resolved in version 2.1.1 🎉

The release is available on:

Your semantic-release bot 📦🚀

@antongolub
Copy link
Collaborator

@musaabal-okaidi, try out the latest build

@antongolub
Copy link
Collaborator

@musaabal-okaidi, any news?

@ghost
Copy link
Author

ghost commented Jul 16, 2020

@antongolub I've tested it and it's working as expected. 😃

Thank you very much for the quick response and fix.

@ghost
Copy link
Author

ghost commented Jul 16, 2020

Is there a difference between this repo and the forked repo @qiwi/multi-semantic-release other than parallel execution?

@antongolub
Copy link
Collaborator

@musaabal-okaidi, glad to hear that.

@qiwi/multi-semantic-release — is just a testing ground for changes required for our in-house development, which may bring unknown side effects. After all the checks, we push this code into the original repository. For example, parallel exec is now a part of msr too. Here's the discussion about it.

dhoulb — LTS
qiwi — canary builds

@ghost
Copy link
Author

ghost commented Jul 16, 2020

Awesome. I'm going to close this issue as it's resolved. If I have other questions or discover anything else then I'll give you a shout.

@ghost ghost closed this as completed Jul 16, 2020
@ghost
Copy link
Author

ghost commented Jul 22, 2020

N.B It's worth noting that we're loosely following a Git Flow approach. So our process is:
A) Branch off develop to work on a new feature. (commit as much as you like without using conventional commit messages)
B) When the feature is complete, merge to develop using a conventional commit message (to allow that feature to be included i the changelog)
C) When we're ready for a prod release, we'll merge develop to master and run tagging/versioning (using semantic-release/multi-semantic-release

During testing, I've been branching off master then merging straight back into master just to save time and that all worked well.

When I came to do my final test by following the actual process which is branch off develop then merge back to develop then when we have a set of features ready we'll merge develop to master I noticed that when I run multi-semantic-release on master it doesn't pick up the merge commits. Would you be able to resolve this issue as well?

antongolub added a commit that referenced this issue Jul 24, 2020
feat: enable first-parent commits filtering by cli flag

closes #29
relates #20
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working question Further information is requested released
Projects
None yet
Development

No branches or pull requests

2 participants