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

Setup a merging queue with commit message checks #5610

Open
igor-sirotin opened this issue Jul 27, 2024 · 6 comments
Open

Setup a merging queue with commit message checks #5610

igor-sirotin opened this issue Jul 27, 2024 · 6 comments
Assignees
Labels

Comments

@igor-sirotin
Copy link
Collaborator

igor-sirotin commented Jul 27, 2024

Problem

Recently we merged #5596 with Squash and Merge feature. It formed this f05b7e7 with message:

[CHERRY-PICK] PRs #5581 #5557 (#5596)

And now all PR's on top of it are not passing the commit message check:

https://ci.status.im/blue/organizations/jenkins/status-go%2Fprs%2Ftests/detail/PR-5608/2/pipeline/

Solution

We need to ensure that suqash/merge commits also have proper message.
I believe merging queue should help us with this. No need to run the whole CI, just the commit message check.

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

@igor-sirotin
Copy link
Collaborator Author

cc @siddarthkay do you think it's possible to implement?

@siddarthkay
Copy link
Contributor

Seems doable. I'll take a stab at this.

@siddarthkay siddarthkay self-assigned this Jul 29, 2024
@siddarthkay
Copy link
Contributor

ouch

A merge queue cannot be enabled with branch protection rules that use wildcard characters (*) in the branch name pattern.

Screenshot 2024-07-29 at 7 20 52 PM

@igor-sirotin
Copy link
Collaborator Author

igor-sirotin commented Jul 29, 2024

Hmm. Can we make the merge queue at least for develop for now?
Or does it require to remove branch protection wildcard rules at all?
cc @siddarthkay

@siddarthkay
Copy link
Contributor

currently testing this on a small repo, I'll get back to you with more info.

@igor-sirotin
Copy link
Collaborator Author

@siddarthkay this is actually important on our way of proper work with breaking changes.
Otherwise it's too simple to make a PR with unknown format in the develop branch 🤷

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

No branches or pull requests

2 participants