Skip to content

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 jimmygchen and michaelsproul 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
- 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
kevaundray pushed a commit to kevaundray/lighthouse that referenced this pull request Feb 3, 2025
* improve mergify config

* negate conflict
kevaundray pushed a commit to kevaundray/lighthouse that referenced this pull request Feb 21, 2025
* improve mergify config

* negate conflict
kamsz pushed a commit to ChorusOne/lighthouse that referenced this pull request Mar 17, 2025
* improve mergify config

* negate conflict
EllipticPoint pushed a commit to EllipticPoint/lighthouse that referenced this pull request Apr 10, 2025
* improve mergify config

* negate conflict
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