Skip to content

Commit

Permalink
update script for new mergify syntax (sigp#6597)
Browse files Browse the repository at this point in the history
  • Loading branch information
jxs authored Jan 22, 2025
1 parent 0d90135 commit dc73791
Showing 1 changed file with 38 additions and 4 deletions.
42 changes: 38 additions & 4 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,36 @@
pull_request_rules:
- name: Ask to resolve conflict
conditions:
- conflict
- -author=dependabot[bot]
- or:
- -draft # Don't report conflicts on regular draft.
- and: # Do report conflicts on draft that are scheduled for the next major release.
- draft
- milestone~=v[0-9]\.[0-9]{2}
actions:
comment:
message: This pull request has merge conflicts. Could you please resolve them
@{{author}}? 🙏

- name: Approve trivial maintainer PRs
conditions:
- base=master
- label=trivial
- author=@sigp/lighthouse
actions:
review:
type: APPROVE

- name: Add ready-to-merge labeled PRs to merge queue
conditions:
# All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection
- base=master
- label=send-it
actions:
queue:


queue_rules:
- name: default
batch_size: 8
Expand All @@ -6,10 +39,11 @@ queue_rules:
merge_method: squash
commit_message_template: |
{{ title }} (#{{ number }})
{% for commit in commits %}
* {{ commit.commit_message }}
{% endfor %}
{{ body | get_section("## Issue Addressed", "") }}
{{ body | get_section("## Proposed Changes", "") }}
queue_conditions:
- "#approved-reviews-by >= 1"
- "check-success=license/cla"
Expand Down

0 comments on commit dc73791

Please sign in to comment.