search

dhoulb / multi-semantic-release

Proof of concept that wraps semantic-release to work with monorepos.
BSD Zero Clause License
203 stars 36 forks source link

Cannot obtain proper commits in scheme of two branches with cross-merges #26

Open antongolub opened 4 years ago

antongolub commented 4 years ago

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?

Originally posted by @musaabal-okaidi in https://github.com/dhoulb/multi-semantic-release/issues/20#issuecomment-662383282

antongolub commented 4 years ago

@musaabal-okaidi I cannot promise that we will fix it quickly. Vacation season, lack of resources.

ghost commented 4 years ago

No worries. I've changed the release to run from the develop branch. I'm also considering switching from Gitflow to GitHub Flow as it seems more fitting for us. And with GitHub Flow there's only master without develop so we won't have to merge twice.

However; it's still good to add this feature to multi-semantic-release for anyone strictly adhering to Gitflow. We might start using multi-semantic-release for other repos that use Gitflow.

antongolub commented 4 years ago

+ ref https://spectrum.chat/semantic-release/general/semantic-release-and-merge-commits~3e02b161-476d-405b-961b-917bbab27e31?authed=true