From 9209a70bb6ecf697486fde689ee5c94b7d5625e0 Mon Sep 17 00:00:00 2001 From: Ted Xu Date: Fri, 17 Jan 2025 10:43:03 +0800 Subject: [PATCH] fix: clang format broken under osx (#38427) See: #38434 --------- Signed-off-by: Ted Xu --- internal/core/build-support/add_cmake_license.sh | 2 +- internal/core/build-support/add_cpp_license.sh | 2 +- internal/core/run_clang_format.sh | 4 +++- scripts/check_cpp_fmt.sh | 9 +-------- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/internal/core/build-support/add_cmake_license.sh b/internal/core/build-support/add_cmake_license.sh index 31959e5c80..5def3ce044 100755 --- a/internal/core/build-support/add_cmake_license.sh +++ b/internal/core/build-support/add_cmake_license.sh @@ -9,7 +9,7 @@ fi cat ${LICENSE} > /dev/null || exit -1 FILES=`find ${FOLDER} \ -| grep -E "(*CMakeLists.txt$)" \ +| grep "CMakeLists.txt$" \ | grep -v thirdparty \ | grep -v cmake_build \ | grep -v cmake-build \ diff --git a/internal/core/build-support/add_cpp_license.sh b/internal/core/build-support/add_cpp_license.sh index 36122ff47c..31990adb04 100755 --- a/internal/core/build-support/add_cpp_license.sh +++ b/internal/core/build-support/add_cpp_license.sh @@ -9,7 +9,7 @@ fi cat ${LICENSE} > /dev/null || exit -1 FILES=`find ${FOLDER} \ -| grep -E "(*\.cpp$|*\.h$|*\.cu$)" \ +| grep "(\.cpp\|\.h\|\.cu)$" \ | grep -v thirdparty \ | grep -v cmake_build \ | grep -v cmake-build \ diff --git a/internal/core/run_clang_format.sh b/internal/core/run_clang_format.sh index a3e3131433..34b7063f5f 100755 --- a/internal/core/run_clang_format.sh +++ b/internal/core/run_clang_format.sh @@ -6,8 +6,10 @@ else fi CorePath=$1 +CLANG_FORMAT=clang-format-12 + formatThis() { - find "$1" | grep -E "(*\.cpp|*\.h|*\.cc)$" | grep -v "gen_tools/templates" | grep -v "\.pb\." | grep -v "tantivy-binding.h" | xargs clang-format-12 -i + find "$1" | grep "(\.cpp\|\.h\|\.cc)$" | grep -v "gen_tools/templates" | grep -v "\.pb\." | grep -v "tantivy-binding.h" | xargs $CLANG_FORMAT -i } formatThis "${CorePath}/src" diff --git a/scripts/check_cpp_fmt.sh b/scripts/check_cpp_fmt.sh index f552f79d77..c103998a6e 100755 --- a/scripts/check_cpp_fmt.sh +++ b/scripts/check_cpp_fmt.sh @@ -30,14 +30,7 @@ pushd $CPP_SRC_DIR ./run_clang_format.sh . popd -if [[ $(uname -s) == "Darwin" ]]; then - if ! brew --prefix --installed grep >/dev/null 2>&1; then - brew install grep - fi - export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH" -fi - -check_result=$(git status | grep -E "*\.h|*\.hpp|*\.cc|*\.cpp") +check_result=$(git status | grep -E "\.h\|\.hpp\|\.cc\|\.cpp") echo "check_result: $check_result" if test -z "$check_result"; then exit 0