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.

Sign up for GitHub

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

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f43a098
improve mergify config
jxs Jan 23, 2025
1f59701
negate conflict
jxs Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

actions:
review:
type: APPROVE
Expand All @@ -26,11 +27,11 @@ pull_request_rules:
conditions:
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
- base=unstable
- label=ready-to-merge
- label=ready-for-merge
- label!=do-not-merge
actions:
queue:


queue_rules:
- name: default
batch_size: 8
Expand All @@ -48,6 +49,7 @@ queue_rules:
- "#approved-reviews-by >= 1"
- "check-success=license/cla"
- "check-success=target-branch-check"
- "label!=do-not-merge"
merge_conditions:
- "check-success=test-suite-success"
- "check-success=local-testnet-success"
Loading