ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Closes #22198: Mergify: Replace deprecated "strict mode" merge action

This commit is contained in:
Sebastian Kaspari 2021-11-29 13:42:22 +01:00
parent 6003e16076
commit c62aa8bf24
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.mergify.yml
View File

@ -1,3 +1,7 @@
queue_rules:
- name: default
conditions:
- status-success=pr-complete
pull_request_rules:
- name: Resolve conflict
conditions:
@ -14,9 +18,10 @@ pull_request_rules:
review:
type: APPROVE
message: MickeyMoz 💪
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
- name: L10N - Auto Merge
conditions:
- author=mozilla-l10n-automation-bot
@ -26,9 +31,10 @@ pull_request_rules:
review:
type: APPROVE
message: LGTM 😎
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
- name: Release automation (Old)
conditions:
- base~=releases[_/].*
@ -51,9 +57,10 @@ pull_request_rules:
review:
type: APPROVE
message: 🚢
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
delete_head_branch:
force: false
- name: Release automation (New)
@ -80,9 +87,10 @@ pull_request_rules:
review:
type: APPROVE
message: 🚢
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
delete_head_branch:
force: false
- name: Needs landing - Rebase
@ -94,9 +102,10 @@ pull_request_rules:
- label!=pr:work-in-progress
- label!=pr:do-not-land
actions:
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
- name: Needs landing - Squash
conditions:
- check-success=pr-complete
@ -106,6 +115,7 @@ pull_request_rules:
- label!=pr:work-in-progress
- label!=pr:do-not-land
actions:
merge:
queue:
method: squash
strict: smart
name: default
rebase_fallback: none