diff --git a/.mergify.yml b/.mergify.yml index daf6d8a9..dc5a9805 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,17 +1,4 @@ pull_request_rules: - - name: Auto-rebase if appropriately labeled or if the author is an authorized bot - conditions: - - or: - - label=auto-update-rebase - - and: - - label=dependencies - - or: &authors_are_bots - - author=renovate[bot] - - author=dependabot[bot] - - -draft - - -conflict - actions: - rebase: - name: Auto-update with merge if appropriately labeled conditions: - label=auto-update-merge @@ -21,7 +8,9 @@ pull_request_rules: update: - name: rebase-merge working updates conditions: - - or: *authors_are_bots + - or: &authors_are_bots + - author=renovate[bot] + - author=dependabot[bot] - label=dependencies - -draft - -conflict