From ba53b61cbb1b4cd76000da8f178020276edd20b5 Mon Sep 17 00:00:00 2001 From: Alexander Koeppe Date: Fri, 31 Jan 2025 21:06:24 +0100 Subject: [PATCH] Add verbosity to CMake Lint step --- .github/workflows/codeql.yml | 5 +++++ misc/cmakelint.sh | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ab4fdee75..8ad30a408 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,9 +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: | 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