diff --git a/.mergify.yml b/.mergify.yml index 6535c5eb48..c759c1e3ec 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,12 +1,15 @@ pull_request_rules: - name: Automatic merge on CI success and review conditions: - - check-success=Sider - - check-success=Semantic Pull Request - - check-success=Python Unit Tests (MariaDB) - - check-success=Python Unit Tests (Postgres) - - check-success=UI Tests (Cypress) - - check-success=security/snyk (frappe) + - status-success=Sider + - status-success=Semantic Pull Request + - status-success=Python Unit Tests (MariaDB) (1) + - status-success=Python Unit Tests (MariaDB) (2) + - status-success=Python Unit Tests (Postgres) (1) + - status-success=Python Unit Tests (Postgres) (2) + - status-success=UI Tests (Cypress) (1) + - status-success=UI Tests (Cypress) (2) + - status-success=security/snyk (frappe) - label!=dont-merge - label!=squash - "#approved-reviews-by>=1" @@ -15,11 +18,14 @@ pull_request_rules: method: merge - name: Automatic squash on CI success and review conditions: - - check-success=Sider - - check-success=Python Unit Tests (MariaDB) - - check-success=Python Unit Tests (Postgres) - - check-success=UI Tests (Cypress) - - check-success=security/snyk (frappe) + - status-success=Sider + - status-success=Python Unit Tests (MariaDB) (1) + - status-success=Python Unit Tests (MariaDB) (2) + - status-success=Python Unit Tests (Postgres) (1) + - status-success=Python Unit Tests (Postgres) (2) + - status-success=UI Tests (Cypress) (1) + - status-success=UI Tests (Cypress) (2) + - status-success=security/snyk (frappe) - label!=dont-merge - label=squash - "#approved-reviews-by>=1"