From 76365a4b916962acb4e033ee1c2d6fb1b029ab1f Mon Sep 17 00:00:00 2001 From: Yellow Shine Date: Fri, 26 Jul 2024 17:09:58 +0800 Subject: [PATCH] conan Signed-off-by: Yellow Shine --- scripts/3rdparty_build.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/3rdparty_build.sh b/scripts/3rdparty_build.sh index 807a0feb6f63c..059dd57c17ddd 100644 --- a/scripts/3rdparty_build.sh +++ b/scripts/3rdparty_build.sh @@ -47,21 +47,22 @@ export CONAN_REVISIONS_ENABLED=1 export CXXFLAGS="-Wno-error=address -Wno-error=deprecated-declarations" export CFLAGS="-Wno-error=address -Wno-error=deprecated-declarations" if [[ ! `conan remote list` == *default-conan-local* ]]; then - conan remote add default-conan-local https://milvus01.jfrog.io/artifactory/api/conan/default-conan-local + conan remote add artifactory https://jfrog.milvus.io/artifactory/api/conan/conan-local + fi unameOut="$(uname -s)" case "${unameOut}" in Darwin*) - conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler=clang -s compiler.version=${llvm_version} -s compiler.libcxx=libc++ -s compiler.cppstd=17 || { echo 'conan install failed'; exit 1; } + conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler=clang -s compiler.version=${llvm_version} -s compiler.libcxx=libc++ -s compiler.cppstd=17 -r artifactory || { echo 'conan install failed'; exit 1; } ;; Linux*) echo "Running on ${OS_NAME}" export CPU_TARGET=avx GCC_VERSION=`gcc -dumpversion` if [[ `gcc -v 2>&1 | sed -n 's/.*\(--with-default-libstdcxx-abi\)=\(\w*\).*/\2/p'` == "gcc4" ]]; then - conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.version=${GCC_VERSION} || { echo 'conan install failed'; exit 1; } + conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.version=${GCC_VERSION} -r artifactory || { echo 'conan install failed'; exit 1; } else - conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.version=${GCC_VERSION} -s compiler.libcxx=libstdc++11 || { echo 'conan install failed'; exit 1; } + conan install ${CPP_SRC_DIR} --install-folder conan --build=missing -s compiler.version=${GCC_VERSION} -s compiler.libcxx=libstdc++11 -r artifactory || { echo 'conan install failed'; exit 1; } fi ;; *)