diff --git a/cmake/analysis/RunClangFormat.cmake b/cmake/analysis/RunClangFormat.cmake index 106ac54ef6..f290116b53 100644 --- a/cmake/analysis/RunClangFormat.cmake +++ b/cmake/analysis/RunClangFormat.cmake @@ -34,26 +34,6 @@ register_command( ALWAYS_RUN ) -if(GIT_CHANGED_SOURCES) - set(CLANG_FORMAT_CHANGED_SOURCES) - foreach(source ${CLANG_FORMAT_SOURCES}) - list(FIND GIT_CHANGED_SOURCES ${source} index) - if(NOT ${index} EQUAL -1) - list(APPEND CLANG_FORMAT_CHANGED_SOURCES ${source}) - endif() - endforeach() -endif() - -if(CLANG_FORMAT_CHANGED_SOURCES) - set(CLANG_FORMAT_DIFF_COMMAND ${CLANG_FORMAT_PROGRAM} - -i # edits files in-place - --verbose - ${CLANG_FORMAT_CHANGED_SOURCES} - ) -else() - set(CLANG_FORMAT_DIFF_COMMAND ${CMAKE_COMMAND} -E echo "No changed files for clang-format") -endif() - register_command( TARGET clang-format-diff diff --git a/cmake/analysis/RunClangTidy.cmake b/cmake/analysis/RunClangTidy.cmake index ee5782ade8..23e1422c27 100644 --- a/cmake/analysis/RunClangTidy.cmake +++ b/cmake/analysis/RunClangTidy.cmake @@ -3,7 +3,7 @@ set(CLANG_TIDY_SOURCES ${BUN_C_SOURCES} ${BUN_CXX_SOURCES}) set(CLANG_TIDY_COMMAND ${CLANG_TIDY_PROGRAM} - -p ${BUILD_PATH} + -p ${BUILD_PATH} --config-file=${CWD}/.clang-tidy ) @@ -40,27 +40,6 @@ register_command( ALWAYS_RUN ) -if(GIT_CHANGED_SOURCES) - set(CLANG_TIDY_CHANGED_SOURCES) - foreach(source ${CLANG_TIDY_SOURCES}) - list(FIND GIT_CHANGED_SOURCES ${source} index) - if(NOT ${index} EQUAL -1) - list(APPEND CLANG_TIDY_CHANGED_SOURCES ${source}) - endif() - endforeach() -endif() - -if(CLANG_TIDY_CHANGED_SOURCES) - set(CLANG_TIDY_DIFF_COMMAND ${CLANG_TIDY_PROGRAM} - ${CLANG_TIDY_CHANGED_SOURCES} - --fix - --fix-errors - --fix-notes - ) -else() - set(CLANG_TIDY_DIFF_COMMAND ${CMAKE_COMMAND} -E echo "No changed files for clang-tidy") -endif() - register_command( TARGET clang-tidy-diff diff --git a/cmake/analysis/RunPrettier.cmake b/cmake/analysis/RunPrettier.cmake index 8c8ceb1ba1..55122f1854 100644 --- a/cmake/analysis/RunPrettier.cmake +++ b/cmake/analysis/RunPrettier.cmake @@ -92,26 +92,6 @@ register_command( ALWAYS_RUN ) -if(GIT_CHANGED_SOURCES) - set(PRETTIER_CHANGED_SOURCES) - foreach(source ${PRETTIER_SOURCES}) - list(FIND GIT_CHANGED_SOURCES ${source} index) - if(NOT ${index} EQUAL -1) - list(APPEND PRETTIER_CHANGED_SOURCES ${source}) - endif() - endforeach() -endif() - -if(PRETTIER_CHANGED_SOURCES) - set(PRETTIER_DIFF_COMMAND ${PRETTIER_COMMAND} - --write - --plugin=prettier-plugin-organize-imports - ${PRETTIER_CHANGED_SOURCES} - ) -else() - set(PRETTIER_DIFF_COMMAND ${CMAKE_COMMAND} -E echo "No changed files for prettier") -endif() - register_command( TARGET prettier-diff diff --git a/cmake/analysis/RunZigFormat.cmake b/cmake/analysis/RunZigFormat.cmake index 0ff7c23865..9486eb4368 100644 --- a/cmake/analysis/RunZigFormat.cmake +++ b/cmake/analysis/RunZigFormat.cmake @@ -25,25 +25,6 @@ register_command( ALWAYS_RUN ) -if(GIT_CHANGED_SOURCES) - set(ZIG_FORMAT_CHANGED_SOURCES) - foreach(source ${ZIG_FORMAT_SOURCES}) - list(FIND GIT_CHANGED_SOURCES ${source} index) - if(NOT ${index} EQUAL -1) - list(APPEND ZIG_FORMAT_CHANGED_SOURCES ${source}) - endif() - endforeach() -endif() - -if(ZIG_FORMAT_CHANGED_SOURCES) - set(ZIG_FORMAT_DIFF_COMMAND ${ZIG_EXECUTABLE} - fmt - ${ZIG_FORMAT_CHANGED_SOURCES} - ) -else() - set(ZIG_FORMAT_DIFF_COMMAND ${CMAKE_COMMAND} -E echo "No changed files for zig-format") -endif() - register_command( TARGET zig-format-diff diff --git a/cmake/tools/SetupGit.cmake b/cmake/tools/SetupGit.cmake index 7f28fe7743..5e084991a7 100644 --- a/cmake/tools/SetupGit.cmake +++ b/cmake/tools/SetupGit.cmake @@ -4,41 +4,9 @@ find_command( COMMAND git REQUIRED - OFF + ${CI} ) if(NOT GIT_PROGRAM) return() endif() - -set(GIT_DIFF_COMMAND ${GIT_PROGRAM} diff --no-color --name-only --diff-filter=AMCR origin/main HEAD) - -execute_process( - COMMAND - ${GIT_DIFF_COMMAND} - WORKING_DIRECTORY - ${CWD} - OUTPUT_STRIP_TRAILING_WHITESPACE - OUTPUT_VARIABLE - GIT_DIFF - ERROR_STRIP_TRAILING_WHITESPACE - ERROR_VARIABLE - GIT_DIFF_ERROR - RESULT_VARIABLE - GIT_DIFF_RESULT -) - -if(NOT GIT_DIFF_RESULT EQUAL 0) - message(WARNING "Command failed: ${GIT_DIFF_COMMAND} ${GIT_DIFF_ERROR}") - return() -endif() - -string(REPLACE "\n" ";" GIT_CHANGED_SOURCES "${GIT_DIFF}") - -if(CI) - set(GIT_CHANGED_SOURCES "${GIT_CHANGED_SOURCES}") - message(STATUS "Set GIT_CHANGED_SOURCES: ${GIT_CHANGED_SOURCES}") -endif() - -list(TRANSFORM GIT_CHANGED_SOURCES PREPEND ${CWD}/) -list(LENGTH GIT_CHANGED_SOURCES GIT_CHANGED_SOURCES_COUNT)