diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml index 1bc9e73fffd04..f3d7f50b286f0 100644 --- a/.github/workflows/mac.yaml +++ b/.github/workflows/mac.yaml @@ -28,7 +28,7 @@ jobs: mac: name: Code Checker MacOS 12 runs-on: macos-12 - timeout-minutes: 300 + timeout-minutes: 300 steps: - name: Checkout uses: actions/checkout@v2 @@ -73,7 +73,7 @@ jobs: fi ls -alh /var/tmp/ccache brew install libomp ninja openblas ccache pkg-config - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 if [[ ! -d "/usr/local/opt/llvm" ]]; then ln -s /usr/local/opt/llvm@14 /usr/local/opt/llvm fi diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 8606a20d5c7da..b4e784f5f2168 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -118,7 +118,7 @@ Milvus uses Conan to manage third-party dependencies for c++. Install Conan ```shell -pip install conan==1.58.0 +pip install conan==1.61.0 ``` Note: Conan version 2.x is not currently supported, please use version 1.58. diff --git a/build/docker/builder/cpu/amazonlinux2023/Dockerfile b/build/docker/builder/cpu/amazonlinux2023/Dockerfile index c9f3f15cecdb2..c349e17f2cceb 100644 --- a/build/docker/builder/cpu/amazonlinux2023/Dockerfile +++ b/build/docker/builder/cpu/amazonlinux2023/Dockerfile @@ -18,7 +18,7 @@ RUN yum install -y wget g++ gcc gdb libatomic libstdc++-static git make zip unzi pkg-config libuuid-devel libaio perl-IPC-Cmd && \ rm -rf /var/cache/yum/* -RUN pip3 install conan==1.58.0 +RUN pip3 install conan==1.61.0 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 diff --git a/build/docker/builder/cpu/ubuntu20.04/Dockerfile b/build/docker/builder/cpu/ubuntu20.04/Dockerfile index 3e95294dfd5f2..8f9af87d88ca7 100644 --- a/build/docker/builder/cpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/cpu/ubuntu20.04/Dockerfile @@ -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.58.0 +RUN pip3 install conan==1.61.0 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 diff --git a/build/docker/builder/gpu/ubuntu20.04/Dockerfile b/build/docker/builder/gpu/ubuntu20.04/Dockerfile index fa2303f3f26b2..69f4552037a81 100644 --- a/build/docker/builder/gpu/ubuntu20.04/Dockerfile +++ b/build/docker/builder/gpu/ubuntu20.04/Dockerfile @@ -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.58.0 +RUN pip3 install conan==1.61.0 # Instal openblas # RUN wget https://github.com/xianyi/OpenBLAS/archive/v0.3.21.tar.gz && \ diff --git a/internal/core/conanfile.py b/internal/core/conanfile.py index fb1cdbc9e276d..69c6e535f3c08 100644 --- a/internal/core/conanfile.py +++ b/internal/core/conanfile.py @@ -14,18 +14,6 @@ class MilvusConan(ConanFile): "lzo/2.10", "arrow/11.0.0", "openssl/3.1.2", - "s2n/1.3.31@milvus/dev", - "aws-c-common/0.8.2@milvus/dev", - "aws-c-compression/0.2.15@milvus/dev", - "aws-c-sdkutils/0.1.3@milvus/dev", - "aws-checksums/0.1.13@milvus/dev", - "aws-c-cal/0.5.20@milvus/dev", - "aws-c-io/0.10.20@milvus/dev", - "aws-c-http/0.6.13@milvus/dev", - "aws-c-auth/0.6.11@milvus/dev", - "aws-c-event-stream/0.2.7@milvus/dev", - "aws-c-s3/0.1.37@milvus/dev", - "aws-crt-cpp/0.17.23@milvus/dev", "aws-sdk-cpp/1.9.234", "googleapis/cci.20221108", "benchmark/1.7.0", diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index c5b0e3f8a7fd6..1e208f18504c6 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -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.58.0 + sudo pip3 install conan==1.61.0 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.58.0 + sudo pip3 install conan==1.61.0 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 @@ -49,7 +49,7 @@ function install_linux_deps() { if [ ! $cmake_version ] || [ `expr $cmake_version \>= 3.24` -eq 0 ]; then echo "cmake version $cmake_version is less than 3.24, wait to installing ..." wget -qO- "https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.tar.gz" | sudo tar --strip-components=1 -xz -C /usr/local - else + else echo "cmake version is $cmake_version" fi } @@ -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.58.0 + pip3 install conan==1.61.0 if [[ $(arch) == 'arm64' ]]; then brew install openssl diff --git a/scripts/install_deps_msys.sh b/scripts/install_deps_msys.sh index 670ab81e8d8df..793612286789d 100644 --- a/scripts/install_deps_msys.sh +++ b/scripts/install_deps_msys.sh @@ -21,9 +21,9 @@ pacmanInstall() mingw-w64-x86_64-python2 \ mingw-w64-x86_64-python-pip \ mingw-w64-x86_64-diffutils \ - mingw-w64-x86_64-go + mingw-w64-x86_64-go - pip3 install conan==1.58.0 + pip3 install conan==1.61.0 } updateKey()