mergify: auto-merge relbot PRs that target the main branch
This commit is contained in:
parent
7cbe730b8a
commit
6bee719969
11
.mergify.yml
11
.mergify.yml
|
@ -5,11 +5,16 @@ queue_rules:
|
||||||
- status-success=complete-pr
|
- status-success=complete-pr
|
||||||
- and:
|
- and:
|
||||||
# For more context, see "Auto Merge" rules down below
|
# For more context, see "Auto Merge" rules down below
|
||||||
- base~=^releases[_/].*
|
|
||||||
- status-success=complete-push
|
- status-success=complete-push
|
||||||
- or:
|
- or:
|
||||||
- head~=^automation/sync-strings-\d+
|
- and:
|
||||||
- head~=^relbot/fenix-\d+
|
- base~=^releases[_/].*
|
||||||
|
- or:
|
||||||
|
- head~=^automation/sync-strings-\d+
|
||||||
|
- head~=^relbot/fenix-\d+
|
||||||
|
- and:
|
||||||
|
- base=main
|
||||||
|
- head~=^relbot/AC-Nightly-.+
|
||||||
pull_request_rules:
|
pull_request_rules:
|
||||||
- name: Resolve conflict
|
- name: Resolve conflict
|
||||||
conditions:
|
conditions:
|
||||||
|
|
Loading…
Reference in New Issue