Skip to content
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# NOTE: the PR is added to the queue when all checks have passed
# and the CI is fully grean and ready to be merged
queue_rules:
- name: default
branch_protection_injection_mode: merge
queue_conditions:
# general prerequisits fo accept the PR in the queue
- label=🤖-automerge # let Mergify know that the PR can be merged (added manually)
Expand All @@ -20,10 +21,11 @@ queue_rules:
- check-success=integration-tests
- check-success=system-tests

# NOTE: these rules help you to forget about the PR
# and let mergify update it and deal with flaky tests
pull_request_rules:
- name: update branch if behind master
conditions:
- queue-name=default # only run if already queued
- label=🤖-automerge
- label!=🤖-do-not-merge
- base=master
Expand All @@ -32,7 +34,6 @@ pull_request_rules:

- name: retry CI on fails (used for flaky tests)
conditions:
- queue-name=default # only run if already queued
- label=🤖-automerge
- label!=🤖-do-not-merge
- base=master
Expand Down