Skip to content

Commit

Permalink
chore(ci): update mergify script
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jxs authored Jan 13, 2025
1 parent 1442ca0 commit d57081f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pull_request_rules:
- label=send-it
- author!=@libp2p/rust-libp2p-maintainers
- author!=dependabot[bot]
# Do not remove approvals if last commit was a merge of master into the branch, required for the PR to be merged.
- commits[-1].author!=@libp2p/rust-libp2p-maintainers
actions:
dismiss_reviews:
message: Approvals have been dismissed because the PR was updated after the
Expand Down Expand Up @@ -61,9 +63,8 @@ pull_request_rules:
queue:

queue_rules:
- name: default merge queue
- name: default
queue_conditions:
- label=send-it
- base=master
merge_conditions: []
merge_method: squash
Expand Down

0 comments on commit d57081f

Please sign in to comment.