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

Improve mergify config #6852

Merged
merged 2 commits into from
Jan 24, 2025
Merged

Improve mergify config #6852

merged 2 commits into from
Jan 24, 2025

Conversation

jxs
Copy link
Member

@jxs jxs commented Jan 23, 2025

Issue Addressed

And partially address #6845

  • use ready-for-merge label instead of ready-to-merge
  • We should ideally remove approval on trivial PRs if the trivial label is removed.
  • Do not let the bot approve trivial PRs that have conflicts.
  • Do not let the bot queue PRs that are labelled `do-not-merge.

the missing one seems impossible as I didn't find a condition for a removed label.

@jxs jxs requested review from michaelsproul and jimmygchen and removed request for michaelsproul January 23, 2025 16:05
@jxs jxs force-pushed the improve-mergify branch from 40492f2 to f43a098 Compare January 23, 2025 16:18
@jxs jxs requested a review from michaelsproul January 23, 2025 16:18
@@ -18,6 +18,7 @@ pull_request_rules:
- base=unstable
- label=trivial
- author=@sigp/lighthouse
- conflict
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be conflict=false?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Jimmy, thanks for noticing it forgot to update, = false doesn't work for boolean types:
Operators are invalid for Boolean attribute: conflict``
I used the - operator to negate it, see here

Copy link
Member

@jimmygchen jimmygchen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks @jxs

@jimmygchen jimmygchen merged commit 029b4f2 into sigp:stable Jan 24, 2025
26 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants