From f9e2fd71c124e8fa1f255dc2c4fff5a48daa6055 Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Tue, 18 Feb 2025 14:54:56 +0100 Subject: [PATCH] docker-qgis-clangtidy: Remove unecessary clang-tidy-diff script download This script is already part of the of the `clang-tidy-15` package --- .docker/docker-qgis-clangtidy.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.docker/docker-qgis-clangtidy.sh b/.docker/docker-qgis-clangtidy.sh index bc0c50f0aa3..2bd928005f9 100755 --- a/.docker/docker-qgis-clangtidy.sh +++ b/.docker/docker-qgis-clangtidy.sh @@ -32,10 +32,6 @@ echo "::endgroup::" cd ${SRCDIR} -echo "::group::Download clang-tidy-diff" -curl -XGET https://raw.githubusercontent.com/llvm/llvm-project/llvmorg-15.0.7/clang-tools-extra/clang-tidy/tool/clang-tidy-diff.py -o clang-tidy-diff.py -echo "::endgroup::" - echo "${bold}Disable unity build...${endbold}" cmake . -B build -DENABLE_UNITY_BUILDS=OFF @@ -44,7 +40,7 @@ echo "${bold}Run clang-tidy on modifications...${endbold}" # We need to add build/src/test dir as extra include directories because when clang-tidy tries to process qgstest.h # it has no compile_commands.json instructions to know what are include directories # It manages to figure out for other headers though, I don't get how... -git diff -U0 HEAD^ | python3 clang-tidy-diff.py -p1 -path=${CTEST_BUILD_DIR} -use-color -extra-arg=-I${CTEST_BUILD_DIR}/src/test/ -clang-tidy-binary /usr/bin/clang-tidy-15 | tee clang-tidy.log +git diff -U0 HEAD^ | python3 /usr/bin/clang-tidy-diff-15.py -p1 -path=${CTEST_BUILD_DIR} -use-color -extra-arg=-I${CTEST_BUILD_DIR}/src/test/ -clang-tidy-binary /usr/bin/clang-tidy-15 | tee clang-tidy.log echo -e "\e[1;34mTo reproduce locally:" echo -e "\e[1;34m - launch cmake with option -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"