Commit d45b1054 authored by Paul Schütze's avatar Paul Schütze
Browse files

Merge branch 'backport_3rdparty_ci' into 'v2.3-stable' 

[v2.3-stable] CI: Exclude 3rdparty from Lint-Diff

See merge request allpix-squared/allpix-squared!767
parents 9d1b6e0c bb21dce4

3rdparty/.clang-format

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 CERN and the Allpix Squared authors

# SPDX-License-Identifier: CC0-1.0



---

DisableFormat: true

SortIncludes: false

...

3rdparty/.clang-tidy

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# SPDX-FileCopyrightText: 2022 CERN and the Allpix Squared authors

# SPDX-License-Identifier: CC0-1.0



---

Checks: '-*,llvm-twine-local'

...

cmake/clang-cpp-checks.cmake

+14 −10
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ IF(CLANG_TIDY AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 
    GET_FILENAME_COMPONENT(CLANG_DIR ${CLANG_TIDY} DIRECTORY)

    FIND_PROGRAM(

        RUN_CLANG_TIDY

        NAMES "run-clang-tidy.py" "run-clang-tidy-${CLANG_FORMAT_VERSION}.py"

        NAMES "run-clang-tidy.py" "run-clang-tidy-${CLANG_TIDY_VERSION}.py"

        HINTS /usr/share/clang/ ${CLANG_DIR}/../share/clang/ /usr/bin/)

    IF(RUN_CLANG_TIDY)

        MESSAGE(STATUS "Found ${RUN_CLANG_TIDY}, adding full-code linting targets")
@@ -133,28 +133,32 @@ IF(CLANG_TIDY AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 


    FIND_PROGRAM(

        CLANG_TIDY_DIFF

        NAMES "clang-tidy-diff.py" "clang-tidy-diff-${CLANG_FORMAT_VERSION}.py"

        NAMES "clang-tidy-diff.py" "clang-tidy-diff-${CLANG_TIDY_VERSION}.py"

        HINTS /usr/share/clang/ ${CLANG_DIR}/../share/clang/ /usr/bin/)

    IF(RUN_CLANG_TIDY)

        MESSAGE(STATUS "Found ${CLANG_TIDY_DIFF}, adding code-diff linting targets")



        # Set target branch to perform the diff against

        # Set target branch and remote to perform the diff against

        IF(NOT TARGET_BRANCH)

            SET(TARGET_BRANCH "v2.3-stable")

        ENDIF()

        IF(NOT TARGET_REMOTE)

            SET(TARGET_REMOTE "origin")

        ENDIF()

        MESSAGE(

            STATUS "Found ${CLANG_TIDY_DIFF}, adding code-diff linting targets against ${TARGET_REMOTE}/${TARGET_BRANCH}")



        ADD_CUSTOM_TARGET(

            lint-diff

            COMMAND git diff --unified=0 origin/${TARGET_BRANCH}... | ${CLANG_TIDY_DIFF} -clang-tidy-binary=${CLANG_TIDY}

                    -path=${CMAKE_BINARY_DIR} -p1 -fix -j${NPROC}

            COMMAND git diff --unified=0 ${TARGET_REMOTE}/${TARGET_BRANCH}... -- ":!3rdparty/*" | ${CLANG_TIDY_DIFF}

                    -clang-tidy-binary=${CLANG_TIDY} -path=${CMAKE_BINARY_DIR} -p1 -fix -j${NPROC}

            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

            COMMENT "Auto fixing problems in differing source files")



        ADD_CUSTOM_TARGET(

            check-lint-diff

            COMMAND

                git diff --unified=0 origin/${TARGET_BRANCH}... | ${CLANG_TIDY_DIFF} -clang-tidy-binary=${CLANG_TIDY}

                -path=${CMAKE_BINARY_DIR} -p1 -j${NPROC} | tee ${CMAKE_BINARY_DIR}/check_lint_file.txt

                git diff --unified=0 ${TARGET_REMOTE}/${TARGET_BRANCH}... -- ":!3rdparty/*" | ${CLANG_TIDY_DIFF}

                -clang-tidy-binary=${CLANG_TIDY} -path=${CMAKE_BINARY_DIR} -p1 -j${NPROC} | tee

                ${CMAKE_BINARY_DIR}/check_lint_file.txt

                # WARNING: fix to stop with error if there are problems

            COMMAND ! grep -c ": error: " ${CMAKE_BINARY_DIR}/check_lint_file.txt > /dev/null

            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
@@ -165,7 +169,7 @@ IF(CLANG_TIDY AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 


ELSE()

    IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")

        MESSAGE(STATUS "Could NOT find clang-tidy version ${CLANG_FORMAT_VERSION}")

        MESSAGE(STATUS "Could NOT find clang-tidy version ${CLANG_TIDY_VERSION}")

    ELSE()

        MESSAGE(STATUS "Could NOT check for clang-tidy, wrong compiler: ${CMAKE_CXX_COMPILER_ID}")

    ENDIF()