mirror of https://github.com/milvus-io/milvus.git
fix: update clang-tidy and clang-format from 10 to 12 (#33141)
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: Patrick Weizhi Xu <weizhi.xu@zilliz.com> Signed-off-by: Yinzuo Jiang <jiangyinzuo@foxmail.com>pull/33817/head
parent
9e99f960ab
commit
7d74edd6dd
|
@ -15,7 +15,7 @@ ARG TARGETARCH
|
|||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-certificates gnupg2 \
|
||||
g++ gcc gdb gdbserver ninja-build 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-12 clang-tidy-12 lcov libtool m4 autoconf automake python3 python3-pip \
|
||||
pkg-config uuid-dev libaio-dev libopenblas-dev && \
|
||||
apt-get remove --purge -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
@ -17,7 +17,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
|
|||
wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
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-12 clang-tidy-12 lcov libtool m4 autoconf automake python3 python3-pip \
|
||||
pkg-config uuid-dev libaio-dev libgoogle-perftools-dev libopenblas-dev && \
|
||||
apt-get remove --purge -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
|
|||
wget -qO- "https://cmake.org/files/v3.27/cmake-3.27.5-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local && \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
g++ gcc gfortran git make ccache libssl-dev zlib1g-dev zip unzip \
|
||||
clang-format clang-tidy lcov libtool m4 autoconf automake python3 python3-pip \
|
||||
clang-format-12 clang-tidy-12 lcov libtool m4 autoconf automake python3 python3-pip \
|
||||
pkg-config uuid-dev libaio-dev libgoogle-perftools-dev libopenblas-dev && \
|
||||
apt-get remove --purge -y && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
|
|
@ -5,8 +5,8 @@ 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
|
||||
- to call clang-format-10, need to install `apt install clang-format-10` in advance
|
||||
- run `./run_clang_format.sh .` to format cpp code
|
||||
- to call clang-format-12, need to install `apt install clang-format-12` in advance
|
||||
- call `build-support/add_${lang}_license.sh` to add license info for cmake and cpp files
|
||||
- under milvus/ directory
|
||||
- use `make cppcheck` to check format, including
|
||||
|
|
|
@ -78,7 +78,7 @@ if (CLANG_FORMAT_VERSION)
|
|||
else()
|
||||
find_program(CLANG_FORMAT_BIN
|
||||
NAMES
|
||||
clang-format-10
|
||||
clang-format-12
|
||||
clang-format
|
||||
PATHS ${ClangTools_PATH} $ENV{CLANG_TOOLS_PATH} /usr/local/bin /usr/bin
|
||||
NO_DEFAULT_PATH
|
||||
|
|
|
@ -7,7 +7,7 @@ fi
|
|||
CorePath=$1
|
||||
|
||||
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 clang-format-12 -i
|
||||
}
|
||||
|
||||
formatThis "${CorePath}/src"
|
||||
|
|
|
@ -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-12 clang-tidy-12 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
|
||||
|
|
Loading…
Reference in New Issue