Skip to content

Commit d57081f

Browse files
authored
chore(ci): update mergify script
missed this, with this dependabot is not able to merge PR's by itself as it needs the `send-it` label. also add a clause for the dismiss of stale approvals to not do so when the last commit was done by one of the `rust-libp2p` maintainers, so that we don't dismiss approvals if the last commit was a merge of master into the PR that is necessary before merging the PR. Latest example of this happening [here](#5758 (comment)) Pull-Request: #5809.
1 parent 1442ca0 commit d57081f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

.github/mergify.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ pull_request_rules:
1919
- label=send-it
2020
- author!=@libp2p/rust-libp2p-maintainers
2121
- author!=dependabot[bot]
22+
# Do not remove approvals if last commit was a merge of master into the branch, required for the PR to be merged.
23+
- commits[-1].author!=@libp2p/rust-libp2p-maintainers
2224
actions:
2325
dismiss_reviews:
2426
message: Approvals have been dismissed because the PR was updated after the
@@ -61,9 +63,8 @@ pull_request_rules:
6163
queue:
6264

6365
queue_rules:
64-
- name: default merge queue
66+
- name: default
6567
queue_conditions:
66-
- label=send-it
6768
- base=master
6869
merge_conditions: []
6970
merge_method: squash

0 commit comments

Comments
 (0)