From 891bab946d53d66c512fe55e5f44a6e5413a49fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Grad?= <jgrad@icp.uni-stuttgart.de>
Date: Tue, 10 Dec 2024 19:21:53 +0100
Subject: [PATCH] Re-enable Clang-Tidy in CI
---
.clang-tidy | 1 +
.gitlab-ci.yml | 35 +++++++++++++++++------------------
src/core/OpenMP.h | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/.clang-tidy b/.clang-tidy
index 74d1c6cf5..fffab0ce3 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -63,6 +63,7 @@ performance-*,
-performance-move-const-arg,
-performance-unnecessary-value-param,
-performance-avoid-endl,
+-performance-no-int-to-ptr,
portability-*,
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ee46ddc0..0e0cc1e16 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2035,24 +2035,23 @@ doc:
## ##
###############################################################################
-#clang-tidy:
-# image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
-# script:
-# - $CXX --version
-# - clang-tidy -version
-# - cmake --version
-# - mkdir $CI_PROJECT_DIR/build
-# - cd $CI_PROJECT_DIR/build
-# - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON -DWALBERLA_LOGLEVEL=DETAIL
-# - cmake . -LA
-# - utilities/filterCompileCommands.py compile_commands.json
-# - wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
-# - python3 run-clang-tidy.py -quiet | tee clang-tidy-output.txt
-# artifacts:
-# paths:
-# - $CI_PROJECT_DIR/build/clang-tidy-output.txt
-# tags:
-# - docker
+clang-tidy:
+ image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17
+ script:
+ - $CXX --version
+ - clang-tidy -version
+ - cmake --version
+ - mkdir $CI_PROJECT_DIR/build
+ - cd $CI_PROJECT_DIR/build
+ - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON -DWALBERLA_LOGLEVEL=DETAIL
+ - cmake . -LA
+ - utilities/filterCompileCommands.py compile_commands.json
+ - run-clang-tidy -quiet | tee clang-tidy-output.txt
+ artifacts:
+ paths:
+ - $CI_PROJECT_DIR/build/clang-tidy-output.txt
+ tags:
+ - docker
cppcheck:
diff --git a/src/core/OpenMP.h b/src/core/OpenMP.h
index b8ae3d607..5e454f37f 100644
--- a/src/core/OpenMP.h
+++ b/src/core/OpenMP.h
@@ -131,7 +131,7 @@ inline int omp_get_num_teams (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
inline int omp_get_team_num (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
inline int omp_get_cancellation (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
-# include <stdlib.h>
+# include <stdlib.h> // NOLINT(modernize-deprecated-headers)
/* OpenMP 4.5 */
inline int omp_get_initial_device (void) { WALBERLA_OPENMP_FUNCTION_ERROR }
inline void* omp_target_alloc(size_t, int) { WALBERLA_OPENMP_FUNCTION_ERROR }
--
GitLab