contributing.md: don't use merge commit when doing release #891
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
minor: warn that either squash or rebase has to be used during the release process
other option would be to ban the merge strategy for PRs in here (project's settings on GH):

or use an action for it that checks all the commits in the PR (checkAllCommitMessages)
The reason why merge commit fails the release pipeline is the fact that we use something like:
if: startsWith(github.event.head_commit.message, 'RELEASE:')
(here) and thatgithub.event.head_commit.message
is actually a commit msg of the newest commit in the PR, but when using the merge commit, it will be the newest one and the msg will be different.Yet another fix could be using
github.event.commits[0].message
which should be the OLDEST commit in the pr batch, but I haven't tried this.Signed-off-by: Jirka Kremser [email protected]