diff --git a/.mergify.yml b/.mergify.yml index 5e4c210..9ff8d7b 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,9 +1,20 @@ # GENERATED CONTENT # remove repo from adrianjost/.github/synced/workflows/generator.js before editing queue_rules: + - name: duplicated branchProtection from auto merge when ready to merge label is + set + queue_conditions: + - author~=dependabot(-preview)?\[bot\] + - label=ready to merge + merge_conditions: [] + merge_method: merge - name: branchProtection - conditions: + queue_conditions: + - author~=dependabot(-preview)?\[bot\] + merge_conditions: - '-merged' + merge_method: squash + pull_request_rules: - name: label PRs with conflicts conditions: @@ -26,21 +37,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 @@ -55,3 +53,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: