Merge pull request #1269 from koeppea/fix-codeql-failure

Fix GitHub workflow issues
Ettercap · Feb 2, 2025 · 9673d0d · 9673d0d
2 parents 9063192 + 131255c
commit 9673d0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -28,20 +28,22 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     - name: Install dependencies
       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
-    - run: |
-        git clone https://github.com/richq/cmake-lint.git
-        cd cmake-lint
-        python setup.py install --user
-        cd -
+
+    - name: CMake formatting check
+      run: |
+        pip install cmakelint
         ./misc/cmakelint.sh
+
+    - name: Building software
+      run: |
         mkdir build
         cd build
         cmake -DENABLE_TESTS=Off $BUILD_ARGS ..
@@ -51,6 +53,6 @@ jobs:
         BUILD_ARGS: ''
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
       with:
         category: "/language:${{matrix.language}}"
diff --git 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
+$CMAKELINT $FIND