diff --git a/.mergify/config.yml b/.mergify/config.yml index d1394723731bfe07b2d249c08b5c3a8d9173b446..021b7a11951adb962fc4c7a0964d1548ccc772b9 100644 --- a/.mergify/config.yml +++ b/.mergify/config.yml @@ -1,5 +1,5 @@ pull_request_rules: - - name: Automatic merge on approval + - name: Automatic merge on approval if CI is passed conditions: - "label=automerge" - "#approved-reviews-by>=1" @@ -16,6 +16,16 @@ pull_request_rules: merge: method: squash + - name: Automatic merge on approval if CI is skipped + conditions: + - "label=automerge" + - "label=skip-ci" + - "status-success=DCO" + - "status-success=Codacy/PR Quality Review" + actions: + merge: + method: squash + - name: Ask to resolve conflict conditions: - conflict