richardphibel / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Blob Blame History Raw
From a7be2c1e61d67f53f9eb90eb3937fa946ccef101 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 21 Sep 2022 15:36:26 +0200
Subject: [PATCH] ci(mergify): Update policy - Drop LGTM checks

rhel-only

Related: #2138081
---
 .github/workflows/differential-shellcheck.yml |  1 +
 .mergify.yml                                  | 34 +++++++------------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml
index 47ec23731d..105f92d1c9 100644
--- a/.github/workflows/differential-shellcheck.yml
+++ b/.github/workflows/differential-shellcheck.yml
@@ -13,6 +13,7 @@ permissions:
 
 jobs:
   lint:
+    name: Differential ShellCheck
     runs-on: ubuntu-latest
 
     permissions:
diff --git a/.mergify.yml b/.mergify.yml
index be25e52c76..ddc79a1d7a 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -22,24 +22,19 @@ pull_request_rules:
         # CentOS CI
         - -check-success=CentOS CI (CentOS Stream 9)
         - -check-success=CentOS CI (CentOS Stream 9 + sanitizers)
-        # LGTM
-        - and:
-          - "-check-success=LGTM analysis: JavaScript"
-          - "-check-neutral=LGTM analysis: JavaScript"
-        - and:
-          - "-check-success=LGTM analysis: Python"
-          - "-check-neutral=LGTM analysis: Python"
-        - and:    
-          - "-check-success=LGTM analysis: C/C++"
-          - "-check-neutral=LGTM analysis: C/C++"
+        # CodeQL
+        - -check-success=CodeQL
         # Packit
         - -check-success=rpm-build:centos-stream-9-aarch64
         - -check-success=rpm-build:centos-stream-9-x86_64
+        # Other
+        - -check-success=Lint Code Base
+        - -check-success=Differential ShellCheck
     actions:
       label:
         add:
           - needs-ci
-          
+
   - name: Remove `needs-ci` label on CI success
     conditions:
       - or:
@@ -61,20 +56,15 @@ pull_request_rules:
           # 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++"
+          # CodeQL
+          - check-success=CodeQL
           # Packit
           - check-success=rpm-build:centos-stream-9-aarch64
           - check-success=rpm-build:centos-stream-9-x86_64
+          # Other
+          - check-success=Lint Code Base
+          - check-success=Differential ShellCheck
     actions:
       label:
         remove:
-          - needs-ci  
+          - needs-ci