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

contributing.md: don't use merge commit when doing release #891

Merged
merged 1 commit into from
May 10, 2022

Conversation

jkremser
Copy link
Member

@jkremser jkremser commented May 9, 2022

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):
Screenshot 2022-05-09 at 16 25 05

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 that github.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 jiri.kremser@gmail.com

Signed-off-by: Jirka Kremser <jiri.kremser@gmail.com>
@jkremser jkremser added the documentation Improvements or additions to documentation label May 9, 2022
@netlify
Copy link

netlify bot commented May 9, 2022

Deploy Preview for k8gb-preview ready!

Name Link
🔨 Latest commit 14d7ad7
🔍 Latest deploy log https://app.netlify.com/sites/k8gb-preview/deploys/627929aa21c537000a0c242e
😎 Deploy Preview https://deploy-preview-891--k8gb-preview.netlify.app/contributing
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

@jkremser jkremser merged commit 474e348 into k8gb-io:master May 10, 2022
@jkremser jkremser deleted the contributing-release branch May 10, 2022 08:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants