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

chore(ci): update mergify script #5809

Merged
merged 3 commits into from
Jan 13, 2025
Merged

chore(ci): update mergify script #5809

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a05d4aa
chore(ci): update mergify script
jxs Jan 12, 2025
7b92caf
do not dismiss if latest commit was a merge from master
jxs Jan 13, 2025
cc8c72c
Merge branch 'master' into update-mergify-script-2
mergify[bot] Jan 13, 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
5 changes: 3 additions & 2 deletions .github/mergify.yml
View file
Open in desktop
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
jxs marked this conversation as resolved.
Show resolved Hide resolved
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
Loading