dryang / rpms / systemd

Forked from rpms/systemd a year ago
Clone
Blob Blame History Raw
From 9fee3c33a05596de1658eb0099cd04cbf0a5d99a Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 19 Jul 2022 12:29:28 +0200
Subject: [PATCH] ci(Mergify): Add `ci-waived` logic

RHEL-only

Related: #2138081
---
 .mergify.yml | 66 ++++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/.mergify.yml b/.mergify.yml
index b7852b201c..be25e52c76 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -4,6 +4,7 @@
 pull_request_rules:
   - name: Add `needs-ci` label on CI fail
     conditions:
+      - label!=ci-waived
       - or:
         # Build test
         - -check-success=build (gcc, 10, bfd)
@@ -31,9 +32,9 @@ pull_request_rules:
         - and:    
           - "-check-success=LGTM analysis: C/C++"
           - "-check-neutral=LGTM analysis: C/C++"
-      # Packit
-      - -check-success=rpm-build:centos-stream-9-aarch64
-      - -check-success=rpm-build:centos-stream-9-x86_64
+        # Packit
+        - -check-success=rpm-build:centos-stream-9-aarch64
+        - -check-success=rpm-build:centos-stream-9-x86_64
     actions:
       label:
         add:
@@ -41,35 +42,38 @@ pull_request_rules:
           
   - name: Remove `needs-ci` label on CI success
     conditions:
-      # Build test
-      - check-success=build (gcc, 10, bfd)
-      - check-success=build (gcc, 11, gold)
-      - check-success=build (clang, 11, bfd)
-      - check-success=build (clang, 12, gold)
-      - check-success=build (clang, 13, lld)
-      # Unit tests
-      - check-success=build (GCC, auto)
-      - check-success=build (GCC_ASAN_UBSAN, auto)
-      - check-success=build (CLANG, auto)
-      - check-success=build (CLANG_ASAN_UBSAN, auto)
-      - check-success=build (GCC, openssl)
-      - check-success=build (CLANG, gcrypt)
-      # CentOS CI
-      - check-success=CentOS CI (CentOS Stream 9)
-      - check-success=CentOS CI (CentOS Stream 9 + sanitizers)
-      # LGTM
       - or:
-        - "check-success=LGTM analysis: JavaScript"
-        - "check-neutral=LGTM analysis: JavaScript"
-      - or:
-        - "check-success=LGTM analysis: Python"
-        - "check-neutral=LGTM analysis: Python"
-      - or:    
-        - "check-success=LGTM analysis: C/C++"
-        - "check-neutral=LGTM analysis: C/C++"
-      # Packit
-      - check-success=rpm-build:centos-stream-9-aarch64
-      - check-success=rpm-build:centos-stream-9-x86_64
+        - label=ci-waived
+        - and:
+          # Build test
+          - check-success=build (gcc, 10, bfd)
+          - check-success=build (gcc, 11, gold)
+          - check-success=build (clang, 11, bfd)
+          - check-success=build (clang, 12, gold)
+          - check-success=build (clang, 13, lld)
+          # Unit tests
+          - check-success=build (GCC, auto)
+          - check-success=build (GCC_ASAN_UBSAN, auto)
+          - check-success=build (CLANG, auto)
+          - check-success=build (CLANG_ASAN_UBSAN, auto)
+          - check-success=build (GCC, openssl)
+          - check-success=build (CLANG, gcrypt)
+          # CentOS CI
+          - check-success=CentOS CI (CentOS Stream 9)
+          - check-success=CentOS CI (CentOS Stream 9 + sanitizers)
+          # LGTM
+          - or:
+            - "check-success=LGTM analysis: JavaScript"
+            - "check-neutral=LGTM analysis: JavaScript"
+          - or:
+            - "check-success=LGTM analysis: Python"
+            - "check-neutral=LGTM analysis: Python"
+          - or:    
+            - "check-success=LGTM analysis: C/C++"
+            - "check-neutral=LGTM analysis: C/C++"
+          # Packit
+          - check-success=rpm-build:centos-stream-9-aarch64
+          - check-success=rpm-build:centos-stream-9-x86_64
     actions:
       label:
         remove: