admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 01:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: upgrade conan version (#35215)

Browse Source 
Signed-off-by: Yellow Shine <sammy.huang@zilliz.com>
This commit is contained in:
yellow-shine 2024-08-02 19:22:15 +08:00 committed by GitHub
parent a4439cc911
commit 7bf68d8657
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/mac.yaml vendored
View File

@ -82,7 +82,7 @@ jobs:
fi fi
ls -alh /var/tmp/ccache ls -alh /var/tmp/ccache
brew install libomp ninja openblas ccache pkg-config brew install libomp ninja openblas ccache pkg-config
pip3 install conan==1.61.0 pip3 install conan==1.64.1
if [[ ! -d "/usr/local/opt/llvm" ]]; then if [[ ! -d "/usr/local/opt/llvm" ]]; then
ln -s /usr/local/opt/llvm@14 /usr/local/opt/llvm ln -s /usr/local/opt/llvm@14 /usr/local/opt/llvm
fi fi

6
DEVELOPMENT.md
View File

@ -164,7 +164,7 @@ Milvus uses Conan to manage third-party dependencies for c++.
Install Conan Install Conan
```shell ```shell
pip install conan==1.61.0 pip install conan==1.64.1
``` ```
Note: Conan version 2.x is not currently supported, please use version 1.61. Note: Conan version 2.x is not currently supported, please use version 1.61.
@ -238,8 +238,8 @@ sudo apt install -y clang-format clang-tidy ninja-build gcc g++ curl zip unzip t
```bash ```bash
# Verify python3 version, need python3 version > 3.8 and version <= 3.11 # Verify python3 version, need python3 version > 3.8 and version <= 3.11
python3 --version python3 --version
# pip install conan 1.61.0 # pip install conan 1.64.1
pip3 install conan==1.61.0 pip3 install conan==1.64.1
``` ```
#### Install GO 1.80 #### Install GO 1.80

2
build/docker/builder/cpu/amazonlinux2023/Dockerfile
View File

@ -27,7 +27,7 @@ RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARG
go clean --modcache && \ go clean --modcache && \
chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR) chmod -R 777 "$GOPATH" && chmod -R a+w $(go env GOTOOLDIR)
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
RUN echo "target arch $TARGETARCH" RUN echo "target arch $TARGETARCH"
RUN 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 RUN 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

2
build/docker/builder/cpu/rockylinux8/Dockerfile
View File

@ -42,7 +42,7 @@ RUN dnf -y update && \
dnf -y install texinfo openblas-devel ninja-build dnf -y install texinfo openblas-devel ninja-build
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.73 -y sh -s -- --default-toolchain=1.73 -y

2
build/docker/builder/cpu/ubuntu20.04/Dockerfile
View File

@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
apt-get remove --purge -y && \ apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
RUN echo "target arch $TARGETARCH" RUN echo "target arch $TARGETARCH"
RUN 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 RUN 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

2
build/docker/builder/cpu/ubuntu22.04/Dockerfile
View File

@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y gcc-12 g++-12 && cd /usr/bin \
&& unlink g++ && ln -s g++-12 g++ \ && unlink g++ && ln -s g++-12 g++ \
&& unlink gcov && ln -s gcov-12 gcov && unlink gcov && ln -s gcov-12 gcov
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
RUN echo "target arch $TARGETARCH" RUN echo "target arch $TARGETARCH"
RUN 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 RUN 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

2
build/docker/builder/gpu/ubuntu20.04/Dockerfile
View File

@ -22,7 +22,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
apt-get remove --purge -y && \ apt-get remove --purge -y && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
RUN mkdir /opt/vcpkg && \ RUN mkdir /opt/vcpkg && \
wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \ wget -qO- vcpkg.tar.gz https://github.com/microsoft/vcpkg/archive/master.tar.gz | tar --strip-components=1 -xz -C /opt/vcpkg && \

2
build/docker/builder/gpu/ubuntu22.04/Dockerfile
View File

@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends wget curl ca-ce
# Install go # Install go
RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go RUN mkdir -p /usr/local/go && wget -qO- "https://go.dev/dl/go1.21.10.linux-$TARGETARCH.tar.gz" | tar --strip-components=1 -xz -C /usr/local/go
# Install conan # Install conan
RUN pip3 install conan==1.61.0 RUN pip3 install conan==1.64.1
# Install rust # Install rust
RUN curl https://sh.rustup.rs -sSf | \ RUN curl https://sh.rustup.rs -sSf | \
sh -s -- --default-toolchain=1.73 -y sh -s -- --default-toolchain=1.73 -y

6
scripts/install_deps.sh
View File

@ -24,7 +24,7 @@ function install_linux_deps() {
clang-format-12 clang-tidy-12 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 pkg-config uuid-dev libaio-dev libopenblas-dev libgoogle-perftools-dev
sudo pip3 install conan==1.61.0 sudo pip3 install conan==1.64.1
elif [[ -x "$(command -v yum)" ]]; then elif [[ -x "$(command -v yum)" ]]; then
# for CentOS devtoolset-11 # for CentOS devtoolset-11
sudo yum install -y epel-release centos-release-scl-rh sudo yum install -y epel-release centos-release-scl-rh
@ -35,7 +35,7 @@ function install_linux_deps() {
libaio libuuid-devel zip unzip \ libaio libuuid-devel zip unzip \
ccache lcov libtool m4 autoconf automake ccache lcov libtool m4 autoconf automake
sudo pip3 install conan==1.61.0 sudo pip3 install conan==1.64.1
echo "source scl_source enable devtoolset-11" | sudo tee -a /etc/profile.d/devtoolset-11.sh echo "source scl_source enable devtoolset-11" | sudo tee -a /etc/profile.d/devtoolset-11.sh
echo "source scl_source enable llvm-toolset-11.0" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh echo "source scl_source enable llvm-toolset-11.0" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh
echo "export CLANG_TOOLS_PATH=/opt/rh/llvm-toolset-11.0/root/usr/bin" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh echo "export CLANG_TOOLS_PATH=/opt/rh/llvm-toolset-11.0/root/usr/bin" | sudo tee -a /etc/profile.d/llvm-toolset-11.sh
@ -69,7 +69,7 @@ function install_mac_deps() {
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH" export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
brew update && brew upgrade && brew cleanup brew update && brew upgrade && brew cleanup
pip3 install conan==1.61.0 pip3 install conan==1.64.1
if [[ $(arch) == 'arm64' ]]; then if [[ $(arch) == 'arm64' ]]; then
brew install openssl brew install openssl

2
scripts/install_deps_msys.sh
View File

@ -23,7 +23,7 @@ pacmanInstall()
mingw-w64-x86_64-diffutils \ mingw-w64-x86_64-diffutils \
mingw-w64-x86_64-go mingw-w64-x86_64-go
pip3 install conan==1.61.0 pip3 install conan==1.64.1
} }
updateKey() updateKey()