fix: remove -10 suffix for clang-tidy and clang-format in install_d…

…eps.sh Default llvm toolchain version in Ubuntu 20.04 is 10, while Ubuntu 22.04 does not have `clang-tidy-10` or `clang-format-10` by default. issue: #33142 Signed-off-by: Yinzuo Jiang <[email protected]>
milvus-io · May 18, 2024 · 646378b · 646378b
1 parent c81be9e
commit 646378b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/docs/design_docs/segcore/scripts_and_tools.md b/docs/design_docs/segcore/scripts_and_tools.md
@@ -5,7 +5,7 @@ The following scripts and commands may be used during segcore development.
 ## code format
 
 - under milvus/internal/core directory
-  - run `./run_clang_format .` to format cpp code
+  - run `./run_clang_format.sh .` to format cpp code
     - to call clang-format-10, need to install `apt install clang-format-10` in advance
     - call `build-support/add_${lang}_license.sh` to add license info for cmake and cpp files
 - under milvus/ directory

diff --git a/internal/core/run_clang_format.sh b/internal/core/run_clang_format.sh
@@ -6,8 +6,15 @@ else
 fi
 CorePath=$1
 
+# Check if clang-format-10 exists
+if command -v clang-format-10 >/dev/null 2>&1; then
+	ClangFormatCmd=clang-format-10
+else
+	ClangFormatCmd=clang-format
+fi
+
 formatThis() {
-    find "$1" | grep -E "(*\.cpp|*\.h|*\.cc)$" | grep -v "gen_tools/templates" | grep -v "\.pb\." | grep -v "tantivy-binding.h" | xargs clang-format-10 -i
+    find "$1" | grep -E "(*\.cpp|*\.h|*\.cc)$" | grep -v "gen_tools/templates" | grep -v "\.pb\." | grep -v "tantivy-binding.h" | xargs $ClangFormatCmd -i
 }
 
 formatThis "${CorePath}/src"

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
@@ -21,7 +21,7 @@ function install_linux_deps() {
     # for Ubuntu 20.04
     sudo apt install -y wget curl ca-certificates gnupg2  \
       g++ gcc gfortran git make ccache libssl-dev zlib1g-dev zip unzip \
-      clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python3 python3-pip \
+      clang-format clang-tidy lcov libtool m4 autoconf automake python3 python3-pip \
       pkg-config uuid-dev libaio-dev libopenblas-dev libgoogle-perftools-dev
 
     sudo pip3 install conan==1.61.0