milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

enhance: upgrade conan version (#35217) 

https://github.com/milvus-io/milvus/pull/35215

Signed-off-by: Yellow Shine <sammy.huang@zilliz.com>
pull/35247/head
yellow-shine 2024-08-02 19:37:45 +08:00 committed by GitHub
parent 2df654274f
commit c5212a42b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ jobs:
fi
ls -alh /var/tmp/ccache
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
ln -s /usr/local/opt/llvm@14 /usr/local/opt/llvm
fi

2
DEVELOPMENT.md
View File

@ -118,7 +118,7 @@ Milvus uses Conan to manage third-party dependencies for c++.
Install Conan
```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.58.

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 && \
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 wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-linux-`uname -m`.tar.gz" | tar --strip-components=1 -xz -C /usr/local

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 && \
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 wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.4-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 && \
rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.61.0
RUN pip3 install conan==1.64.1
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 && \

6
scripts/install_deps.sh
View File

@ -24,7 +24,7 @@ function install_linux_deps() {
clang-format-10 clang-tidy-10 lcov libtool m4 autoconf automake python3 python3-pip \
pkg-config uuid-dev libaio-dev libgoogle-perftools-dev
sudo pip3 install conan==1.61.0
sudo pip3 install conan==1.64.1
elif [[ -x "$(command -v yum)" ]]; then
# for CentOS devtoolset-11
sudo yum install -y epel-release centos-release-scl-rh
@ -35,7 +35,7 @@ function install_linux_deps() {
libaio libuuid-devel zip unzip \
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 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
@ -60,7 +60,7 @@ function install_mac_deps() {
export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH"
brew update && brew upgrade && brew cleanup
pip3 install conan==1.61.0
pip3 install conan==1.64.1
if [[ $(arch) == 'arm64' ]]; then
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-go
pip3 install conan==1.61.0
pip3 install conan==1.64.1
}
updateKey()