Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Nov 20, 2024
1 parent 5934de0 commit b751d69
Showing 1 changed file with 33 additions and 29 deletions.
62 changes: 33 additions & 29 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,26 @@
queue_rules:
- name: duplicated default from Re-queue any PR with a 'requeue' label
queue_conditions:
- label=requeue
merge_conditions: []
merge_method: fast-forward
update_method: rebase
autosquash: true
merge_bot_account: &name_merge_bot rbusarow-bot
update_bot_account: &name_merge_bot rbusarow-bot

Check failure on line 10 in .mergify.yml

View check run for this annotation

Mergify / Configuration changed

Invalid YAML

found duplicate anchor; first occurrence in "<unicode string>", line 9, column 24 second occurrence in "<unicode string>", line 10, column 25
- name: default
merge_conditions:
- and: &label_automerge
- label=automerge
- and: &base_main
- base=main
- and: &not_label_dnm
- label!=do-not-merge
merge_method: fast-forward
update_method: rebase
autosquash: true
merge_bot_account: *name_merge_bot
update_bot_account: *name_merge_bot
shared:
author-bot: &author_bot
- or:
Expand All @@ -6,42 +29,25 @@ shared:
- author=renovate[bot]
author-rbusarow: &author_rbusarow
- author=RBusarow
base-main: &base_main
- base=main
base-main: *base_main
label-approved: &label_approved
- label=approved
label-automerge: &label_automerge
- label=automerge
label-dnm: &label_dnm
label-automerge: *label_automerge
label-dnm:
- label=do-not-merge
not-label-dnm: &not_label_dnm
- label!=do-not-merge
not-label-dnm: *not_label_dnm
label-rebase: &label_rebase
- label=rebase
name-approved: &name_approved approved
name-automerge: &name_automerge automerge
name-rb-org-bot: &name_rb_org_bot rb-org-bot[bot]
name-merge-bot: &name_merge_bot rbusarow-bot
name-merge-bot: *name_merge_bot
name-rebase: &name_rebase rebase
success-ci: &success_ci
- check-success=all-checks

pull_request_rules:
- name: Queue PRs for rebase-merge when CI passes and approved
# GitHub branch protection rules are also applied automatically
conditions:
- and: *label_automerge
- and: *base_main
- and: *not_label_dnm
actions:
queue:
# maybe change to 'rebase' if this causes problems
merge_method: fast-forward
update_method: rebase # this is also the default when 'merge_method' is 'fast-forward'
autosquash: true
merge_bot_account: *name_merge_bot
update_bot_account: *name_merge_bot

pull_request_rules:
- name: Remove automerge label once merged
conditions:
- merged
Expand Down Expand Up @@ -96,12 +102,10 @@ pull_request_rules:
conditions:
- label=requeue
actions:
queue:
# maybe change to 'rebase' if this causes problems
merge_method: fast-forward
update_method: rebase # this is also the default when 'merge_method' is 'fast-forward'
autosquash: true
merge_bot_account: *name_merge_bot
label:
remove:
- requeue
- name: refactored queue action rule
conditions: []
actions:
queue:

0 comments on commit b751d69

Please sign in to comment.