-
Notifications
You must be signed in to change notification settings - Fork 174
tide: add configurable GitHub merge blocks enforcement #579
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
base: main
Are you sure you want to change the base?
Conversation
✅ Deploy Preview for k8s-prow ready!
To edit notification comments on pull requests, go to your Netlify project configuration. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Prucek The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Thanks for following up on this! Opt-in config seems like a reasonable short-term way forward. Some thoughts (have not yet looked at the code): I'm not sure I feel comfortable leaving default-configured (and even explicitly configured) instances vulnerable to the class of #269 -like bugs. Some repos may have policies that help them not getting affected by some instances of this problem but not necessarily to all, and the "tide silently fails to merge and never surfaces the problem" error is really annoying to leave some instances open to it. So to me it seems we'd still need to invent some way to propagate the actual merge failure, post-fact, to PR author somehow, I don't think we could consider #269 -like issues fully fixed 🤔 Configuration booleans are always a bit of a smell, for similar reasons like API Conventions states:
For this specific case, I think we may prefer treating this as a three-value for starters:
We'd start with |
2a09353 to
8560319
Compare
|
Thanks @petr-muller for the guidance! That is definitely a good point. I updated the PR based on your comments. |
8560319 to
7f08e03
Compare
Adds a new
github_merge_blocks_policyconfiguration option that allowsTide to check GitHub's
mergeStateStatusto prevent merging PRs that areblocked by GitHub due to branch protection rules, rulesets, required
reviews, etc.
The configuration can be set globally with '*' or per-org/repo level.
Defaults to "permit".
Valid values:
status for monitoring. Use this to identify repos needing BP/ruleset fixes.
Fixes #575, #269
Previous attempt: #537
🤖 Assisted by Claude.