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

upstream-sync
Sebastian Kaspari 3 years ago
parent 6003e16076
commit c62aa8bf24

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

Loading…
Cancel
Save