Commit e2d21e85 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'p/lint_diff_relative_commits' into 'master' 

CI: lint-diff only on new commits wrt to target branch

See merge request allpix-squared/allpix-squared!653
parents a0fd940b 7a6e295b

cmake/clang-cpp-checks.cmake

+3 −3
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ IF(CLANG_TIDY AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 


        ADD_CUSTOM_TARGET(

            lint-diff

            COMMAND git diff --unified=0 origin/${TARGET_BRANCH} | ${CLANG_TIDY_DIFF} -path=${CMAKE_BINARY_DIR} -p1 -fix

            COMMAND git diff --unified=0 origin/${TARGET_BRANCH}... | ${CLANG_TIDY_DIFF} -path=${CMAKE_BINARY_DIR} -p1 -fix

                    -j${NPROC}

            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}

            COMMENT "Auto fixing problems in differing source files")
@@ -151,8 +151,8 @@ IF(CLANG_TIDY AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") 
        ADD_CUSTOM_TARGET(

            check-lint-diff

            COMMAND

                git diff --unified=0 origin/${TARGET_BRANCH} | ${CLANG_TIDY_DIFF} -path=${CMAKE_BINARY_DIR} -p1 -j${NPROC} |

                tee ${CMAKE_BINARY_DIR}/check_lint_file.txt

                git diff --unified=0 origin/${TARGET_BRANCH}... | ${CLANG_TIDY_DIFF} -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}