diff --git a/.github/mergify.yml b/.github/mergify.yml index 0a84a93..5f239b5 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,7 +2,9 @@ queue_rules: - name: default queue_conditions: - base=main - - "#approved-reviews-by>=1" + - or: + - "#approved-reviews-by>=1" + - author=jacobweinstock - "#changes-requested-reviews-by=0" - "#review-requested=0" - check-success=DCO @@ -11,8 +13,16 @@ queue_rules: - label=ready-to-merge merge_conditions: # Conditions to get out of the queue (= merged) + - base=main + - or: + - "#approved-reviews-by>=1" + - author=jacobweinstock + - "#changes-requested-reviews-by=0" + - "#review-requested=0" - check-success=DCO - check-success=build + - label!=do-not-merge + - label=ready-to-merge commit_message_template: | {{ title }} (#{{ number }})