From 7a70487004ee8f67132b15c1f33cfa02639d2a6d Mon Sep 17 00:00:00 2001 From: congqixia Date: Fri, 18 Aug 2023 15:22:13 +0800 Subject: [PATCH] Fix dco-pass rule in mergify check for v1.0.x branch (#193) Signed-off-by: Congqi Xia --- .github/mergify.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 8eb9864..eb46c4b 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -2,8 +2,8 @@ pull_request_rules: - name: Add needs-dco label when DCO check failed conditions: - or: - - -base=main - - -base=v.+ + - base=main + - base=v.+ - -status-success=DCO actions: label: @@ -17,7 +17,9 @@ pull_request_rules: - name: Add dco-passed label when DCO check passed conditions: - - base=main + - or: + - base=main + - base=v.+ - status-success=DCO actions: label: