Skip to content

Commit ca1851b

Browse files
Merge branch 'master' into fix-pydantic-userwarings
2 parents 5eab207 + 8fd24a2 commit ca1851b

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

.github/mergify.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# NOTE: the PR is added to the queue when all checks have passed
2+
# and the CI is fully grean and ready to be merged
13
queue_rules:
24
- name: default
35
queue_conditions:
@@ -19,10 +21,11 @@ queue_rules:
1921
- check-success=integration-tests
2022
- check-success=system-tests
2123

24+
# NOTE: these rules help you to forget about the PR
25+
# and let mergify update it and deal with flaky tests
2226
pull_request_rules:
2327
- name: update branch if behind master
2428
conditions:
25-
- queue-name=default # only run if already queued
2629
- label=🤖-automerge
2730
- label!=🤖-do-not-merge
2831
- base=master
@@ -31,7 +34,6 @@ pull_request_rules:
3134

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

0 commit comments

Comments
 (0)