From f5bb9a3d91d2900eec94e20f8e22e0f322bce816 Mon Sep 17 00:00:00 2001
From: Alexander Koeppe <format_c@online.de>
Date: Thu, 23 Jan 2025 20:59:11 +0100
Subject: [PATCH] use maintained cmake-lint fork for codeql workflow

---
 .github/workflows/codeql.yml | 10 ++++++----
 misc/cmakelint.sh            |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 8bf1d6aed..8ad30a408 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -36,12 +36,14 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y bison check cmake debhelper flex groff libbsd-dev libcurl4-openssl-dev libmaxminddb-dev libgtk-3-dev libgtk2.0-dev libidn11-dev libltdl-dev libluajit-5.1-dev libncurses5-dev libnet1-dev libpcap-dev libpcre3-dev librtmp-dev libssl-dev
+
+    - name: CMake formatting check
     - run: |
-        git clone https://github.com/richq/cmake-lint.git
-        cd cmake-lint
-        python setup.py install --user
-        cd -
+        pip install cmakelint
         ./misc/cmakelint.sh
+
+    - name: Building software
+    - run: |
         mkdir build
         cd build
         cmake -DENABLE_TESTS=Off $BUILD_ARGS ..
diff --git a/misc/cmakelint.sh b/misc/cmakelint.sh
index ca172f905..430ca14cc 100755
--- a/misc/cmakelint.sh
+++ b/misc/cmakelint.sh
@@ -48,10 +48,11 @@ FILTERS=\
 +whitespace/newline,\
 +whitespace/tabs
 
+echo Running CMake Lint against CMake files
 CMAKELINT="cmakelint --filter=$FILTERS --quiet --spaces=2"
 
 FIND="$(find $ECROOT \
 -name CMakeLists.txt -not -path "$ECROOT/build*/*" -or \
 -name *.cmake -not -path "$ECROOT/build*/*")"
 
-$CMAKELINT $FIND
\ No newline at end of file
+$CMAKELINT $FIND