diff --git a/.mergify.yml b/.mergify.yml index 8ea02b1..d3b5008 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,6 +8,18 @@ merge_protections_settings: - -draft - author != dependabot[bot] - author != renovate[bot] + - "#approved-reviews-by >= 1" + - github-code-owner-review-satisfied + - check-success = "ci / ci" + +merge_protections: + - name: require-review-and-ci + if: + - base = main + success_conditions: + - "#approved-reviews-by >= 1" + - github-code-owner-review-satisfied + - check-success = "ci / ci" queue_rules: - name: default @@ -16,6 +28,13 @@ queue_rules: - -draft - author != dependabot[bot] - author != renovate[bot] + - "#approved-reviews-by >= 1" + - github-code-owner-review-satisfied + - check-success = "ci / ci" + merge_conditions: + - "#approved-reviews-by >= 1" + - github-code-owner-review-satisfied + - check-success = "ci / ci" merge_method: squash commit_message_format: title: inherit