Skip to content

Commit 23d35ac

Browse files
authored
Merge pull request #2735 from benjeffery/fix-mergify3
Fix mergify
2 parents 72a7add + 7402716 commit 23d35ac

File tree

1 file changed

+0
-29
lines changed

1 file changed

+0
-29
lines changed

.mergify.yml

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ pull_request_rules:
4343
queue:
4444
name: default
4545
method: rebase
46-
rebase_fallback: none
4746
update_method: rebase
4847

4948
- name: Remove label after merge
@@ -55,31 +54,3 @@ pull_request_rules:
5554
remove:
5655
- AUTOMERGE-REQUESTED
5756

58-
- name: Automatic dep update
59-
conditions:
60-
- author~=^dependabot(|-preview)\[bot\]$
61-
- "-merged"
62-
- base=main
63-
- label=dependancy-upgrade
64-
- status-success=Docs
65-
- status-success=Lint
66-
- status-success=Python (3.7, macos-latest)
67-
- status-success=Python (3.9, macos-latest)
68-
- status-success=Python (3.11, macos-latest)
69-
- status-success=Python (3.7, ubuntu-latest)
70-
- status-success=Python (3.9, ubuntu-latest)
71-
- status-success=Python (3.11, ubuntu-latest)
72-
- status-success=Python (3.7, windows-latest)
73-
- status-success=Python (3.9, windows-latest)
74-
- status-success=Python (3.11, windows-latest)
75-
- "status-success=ci/circleci: build"
76-
- "status-success=ci/circleci: build-32"
77-
- status-success=codecov/patch
78-
- status-success=codecov/project/c-tests
79-
- status-success=codecov/project/python-c-tests
80-
- status-success=codecov/project/python-tests
81-
actions:
82-
queue:
83-
name: default
84-
method: rebase
85-
update_method: rebase

0 commit comments

Comments
 (0)