Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Commit

Permalink
Closes #11188: Mergify: Replace deprecated "strict mode" merge action
Browse files Browse the repository at this point in the history
  • Loading branch information
pocmo committed Nov 29, 2021
1 parent 5c1494b commit 3ec0c97
Showing 1 changed file with 19 additions and 10 deletions.
29 changes: 19 additions & 10 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
queue_rules:
- name: default
conditions:
- status-success=complete-pr
pull_request_rules:
- name: Resolve conflict
conditions:
Expand All @@ -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
Expand All @@ -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
conditions:
- author=github-actions[bot]
Expand All @@ -38,9 +44,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
Expand All @@ -52,9 +59,10 @@ pull_request_rules:
- label!=work in progress
- label!=do not land
actions:
merge:
queue:
method: rebase
strict: smart
name: default
rebase_fallback: none
- name: Needs landing - Squash
conditions:
- status-success=complete-pr
Expand All @@ -64,6 +72,7 @@ pull_request_rules:
- label!=work in progress
- label!=do not land
actions:
merge:
queue:
method: squash
strict: smart
name: default
rebase_fallback: none

0 comments on commit 3ec0c97

Please sign in to comment.