From 4b29299f7e857fa4a5576bddfaf9bf06d27d7e5b Mon Sep 17 00:00:00 2001 From: JinHai-CN Date: Thu, 3 Sep 2020 11:35:10 +0800 Subject: [PATCH] Update mergify/config Signed-off-by: JinHai-CN --- .mergify/config.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.mergify/config.yml b/.mergify/config.yml index d1394723..021b7a11 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 -- GitLab