Update mergify queue conditions to account for update-nimbus-experiments PRs (#27774)
The update-nimbus-experiments workflow creates PRs that don't schedule a `complete-pr` task (because the github-actions bot is untrusted), but in this case we have a `complete-push` task which is good enough.
This commit is contained in:
parent
9113bdb513
commit
aa7e56d036
13
.mergify.yml
13
.mergify.yml
|
@ -3,18 +3,7 @@ queue_rules:
|
||||||
conditions:
|
conditions:
|
||||||
- or:
|
- or:
|
||||||
- status-success=complete-pr
|
- status-success=complete-pr
|
||||||
- and:
|
- status-success=complete-push
|
||||||
# For more context, see "Auto Merge" rules down below
|
|
||||||
- status-success=complete-push
|
|
||||||
- or:
|
|
||||||
- and:
|
|
||||||
- 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