richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
8d86bd
From 0feaf0be515c02a10ca12f726b4a8424262cf09c Mon Sep 17 00:00:00 2001
8d86bd
From: Jan Macku <jamacku@redhat.com>
8d86bd
Date: Tue, 19 Jul 2022 12:43:43 +0200
8d86bd
Subject: [PATCH] ci(Mergify): Add `ci-waived` logic
8d86bd
8d86bd
RHEL-only
8d86bd
8d86bd
Related: #2087152
8d86bd
---
8d86bd
 .mergify.yml | 32 ++++++++++++++++++--------------
8d86bd
 1 file changed, 18 insertions(+), 14 deletions(-)
8d86bd
8d86bd
diff --git a/.mergify.yml b/.mergify.yml
8d86bd
index 6fa400effd..3afd04f18e 100644
8d86bd
--- a/.mergify.yml
8d86bd
+++ b/.mergify.yml
8d86bd
@@ -4,6 +4,7 @@
8d86bd
 pull_request_rules:
8d86bd
   - name: Add `needs-ci` label on CI fail
8d86bd
     conditions:
8d86bd
+      - label!=ci-waived
8d86bd
       - or:
8d86bd
         # Unit tests
8d86bd
         - -check-success=build (stream8, GCC)
8d86bd
@@ -27,21 +28,24 @@ pull_request_rules:
8d86bd
 
8d86bd
   - name: Remove `needs-ci` label on CI success
8d86bd
     conditions:
8d86bd
-      # Unit tests
8d86bd
-      - check-success=build (stream8, GCC)
8d86bd
-      - check-success=build (stream8, GCC_ASAN)
8d86bd
-      # CentOS Stream CI
8d86bd
-      - check-success=CentOS CI (CentOS Stream 8)
8d86bd
-      # LGTM
8d86bd
       - or:
8d86bd
-        - "check-success=LGTM analysis: JavaScript"
8d86bd
-        - "check-neutral=LGTM analysis: JavaScript"
8d86bd
-      - or:
8d86bd
-        - "check-success=LGTM analysis: Python"
8d86bd
-        - "check-neutral=LGTM analysis: Python"
8d86bd
-      - or:    
8d86bd
-        - "check-success=LGTM analysis: C/C++"
8d86bd
-        - "check-neutral=LGTM analysis: C/C++"
8d86bd
+        - label=ci-waived
8d86bd
+        - and:
8d86bd
+          # Unit tests
8d86bd
+          - check-success=build (stream8, GCC)
8d86bd
+          - check-success=build (stream8, GCC_ASAN)
8d86bd
+          # CentOS Stream CI
8d86bd
+          - check-success=CentOS CI (CentOS Stream 8)
8d86bd
+          # LGTM
8d86bd
+          - or:
8d86bd
+            - "check-success=LGTM analysis: JavaScript"
8d86bd
+            - "check-neutral=LGTM analysis: JavaScript"
8d86bd
+          - or:
8d86bd
+            - "check-success=LGTM analysis: Python"
8d86bd
+            - "check-neutral=LGTM analysis: Python"
8d86bd
+          - or:    
8d86bd
+            - "check-success=LGTM analysis: C/C++"
8d86bd
+            - "check-neutral=LGTM analysis: C/C++"
8d86bd
     actions:
8d86bd
       label:
8d86bd
         remove: