Skip to content

Commit 07a8a29

Browse files
authored
Adjust mergify config (#3667)
1 parent 7978c8a commit 07a8a29

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

.mergify.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ pull_request_rules:
88
actions:
99
merge:
1010
method: squash
11-
- name: Automatic merge non-dependabot PRs when approved and tested
11+
- name: Automatic merge Apollon77 PRs when tested and flagged as automerge
1212
conditions:
13-
- "author!=dependabot[bot]" # dependabot PRs are handled above
14-
- label!="automated-npm-release" # Don't auto merge automated PRs, other processes do this
15-
- label!="automated-docker-release" # Don't auto merge automated PRs, other processes do this
16-
- "#approved-reviews-by>=1"
13+
- "author=Apollon77" # Apollon77 is the PR author
1714
- "#review-threads-unresolved=0"
1815
- "-draft"
1916
- "#check-failure=0" # Don't auto merge with a failure
@@ -23,9 +20,13 @@ pull_request_rules:
2320
update:
2421
merge:
2522
method: squash
26-
- name: Automatic merge Apollon77 PRs when tested and flagged as automerge
23+
- name: Automatic merge non-dependabot PRs when approved and tested
2724
conditions:
28-
- "author=Apollon77" # Apollon77 is the PR author
25+
- "author!=dependabot[bot]" # dependabot PRs are handled above
26+
- "author!=Apollon77" # Apollon77 is handled above
27+
- label!="automated-npm-release" # Don't auto merge automated PRs, other processes do this
28+
- label!="automated-docker-release" # Don't auto merge automated PRs, other processes do this
29+
- "#approved-reviews-by>=1"
2930
- "#review-threads-unresolved=0"
3031
- "-draft"
3132
- "#check-failure=0" # Don't auto merge with a failure

0 commit comments

Comments
 (0)