aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2024-02-18 13:29:03 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2024-02-27 13:44:42 +0000
commit43ed89e71a892d160eaa6fcf7c2bdc51f5f50cb7 (patch)
treeba067e0e63e7a9289072d4980220436eb9ce6bdd
parent60961e79e62edb20b7977be4ba197e4ba6e268b0 (diff)
Update clang-tidy job to Jammy
Change-Id: Ice564ac6cfb6092db54f10dd0608d1299f752a84 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.clang-tidy6
-rw-r--r--.github/workflows/main.yml2
-rwxr-xr-xscripts/run-analyzer.sh4
-rw-r--r--src/shared/quickjs/.clang-tidy12
4 files changed, 6 insertions, 18 deletions
diff --git a/.clang-tidy b/.clang-tidy
index e737372e9..92e6eeefe 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -2,6 +2,7 @@
Checks: >
-*,
bugprone-*,
+ -bugprone-easily-swappable-parameters,
-bugprone-narrowing-conversions,
-bugprone-throw-keyword-missing,
cppcoreguidelines-interfaces-global-init,
@@ -12,7 +13,7 @@ Checks: >
google-build-namespaces,
google-global-names-in-headers,
google-objc-*,
- google-readability-casting,
+ -google-readability-casting,
google-readability-namespace-comments,
google-runtime-operator,
misc-definitions-in-headers,
@@ -70,6 +71,3 @@ WarningsAsErrors: >
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
-CheckOptions:
-...
-
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3245ec4cd..2c8e21e35 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
- {
name: 'Build on Linux (clang_tidy)',
script: './scripts/run-analyzer.sh',
- image: 'focal-qt6',
+ image: 'jammy-qt6',
options: 'profile:qt-clang_64 modules.cpp.compilerWrapper:ccache',
cacheid: 'clang',
}
diff --git a/scripts/run-analyzer.sh b/scripts/run-analyzer.sh
index a410e8b4c..9e53e50dd 100755
--- a/scripts/run-analyzer.sh
+++ b/scripts/run-analyzer.sh
@@ -45,12 +45,12 @@ LLVM_INSTALL_DIR=${LLVM_INSTALL_DIR:-""}
# update-alternatives --install /usr/bin/run-clang-tidy.py run-clang-tidy.py /usr/bin/run-clang-tidy-4.0.py 1
CLANG_TIDY=`which clang-tidy`
-RUN_CLANG_TIDY=`which run-clang-tidy.py`
+RUN_CLANG_TIDY=`which run-clang-tidy`
if [ -z "$RUN_CLANG_TIDY" ] || [ -z "$CLANG_TIDY" ]; then
if [ ! -z "$LLVM_INSTALL_DIR" ]; then
CLANG_TIDY="$LLVM_INSTALL_DIR/bin/clang-tidy"
- RUN_CLANG_TIDY="$LLVM_INSTALL_DIR/share/clang/run-clang-tidy.py"
+ RUN_CLANG_TIDY="$LLVM_INSTALL_DIR/bin/run-clang-tidy"
else
echo "Can't find clang-tidy and/or run-clang-tidy.py in PATH, try setting LLVM_INSTALL_DIR"
exit 1
diff --git a/src/shared/quickjs/.clang-tidy b/src/shared/quickjs/.clang-tidy
index c5e5db244..b9209aae5 100644
--- a/src/shared/quickjs/.clang-tidy
+++ b/src/shared/quickjs/.clang-tidy
@@ -1,13 +1,3 @@
----
-Checks: >
- -bugprone-branch-clone,
- -bugprone-easily-swappable-parameters,
- -bugprone-implicit-widening-of-multiplication-result,
- -bugprone-signed-char-misuse,
- -bugprone-suspicious-memory-comparison,
- -bugprone-sizeof-expression,
- -misc-redundant-expression,
- -misc-unused-parameters
+Checks: '-*,misc-definitions-in-headers'
InheritParentConfig: true
-...