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 Dec 1, 2024
1 parent b65aec0 commit 45861c9
Showing 1 changed file with 21 additions and 15 deletions.
36 changes: 21 additions & 15 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# GENERATED CONTENT
# remove repo from adrianjost/.github/synced/workflows/generator.js before editing
queue_rules:
- name: duplicated branchProtection from auto merge passing Dependabot pull requests
queue_conditions:
- author~=dependabot(-preview)?\[bot\]
merge_conditions:
- '-merged'
merge_method: squash
- name: duplicated branchProtection from auto merge when ready to merge label is
set
queue_conditions:
- label=ready to merge
merge_conditions:
- '-merged'
merge_method: merge
- name: branchProtection
conditions:
- '-merged'

pull_request_rules:
- name: label PRs with conflicts
conditions:
Expand All @@ -26,21 +40,8 @@ pull_request_rules:
- conflict
actions:
comment:
message: Someone with write access should tell dependabot to recreate this PR.
- name: auto merge passing Dependabot pull requests
conditions:
- author~=dependabot(-preview)?\[bot\]
actions:
queue:
name: branchProtection
method: squash
- name: auto merge when ready to merge label is set
conditions:
- label=ready to merge
actions:
queue:
name: branchProtection
method: merge
message: Someone with write access should tell dependabot to recreate this
PR.
- name: remove ready to merge when merged
conditions:
- merged
Expand All @@ -55,3 +56,8 @@ pull_request_rules:
- label!=WIP
actions:
delete_head_branch: {}
- name: auto merge passing Dependabot pull requests + auto merge when ready to merge
label is set
conditions: []
actions:
queue:

0 comments on commit 45861c9

Please sign in to comment.