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

enhance: pinpoint revision of 3thirdparty package (#35325) 

issue: https://github.com/milvus-io/milvus/issues/35340

---------

Signed-off-by: Yellow Shine <sammy.huang@zilliz.com>
pull/35369/head
yellow-shine 2024-08-08 09:46:22 +08:00 committed by GitHub
parent ae1b81ac1a
commit 7420115b5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
internal/core/conanfile.py
View File

@ -5,44 +5,44 @@ class MilvusConan(ConanFile):
keep_imports = True
settings = "os", "compiler", "build_type", "arch"
requires = (
"rocksdb/6.29.5@milvus/dev",
"boost/1.82.0",
"onetbb/2021.9.0",
"nlohmann_json/3.11.2",
"zstd/1.5.4",
"lz4/1.9.4",
"snappy/1.1.9",
"lzo/2.10",
"arrow/15.0.0",
"openssl/3.1.2",
"aws-sdk-cpp/1.9.234",
"googleapis/cci.20221108",
"benchmark/1.7.0",
"gtest/1.13.0",
"protobuf/3.21.4",
"rapidxml/1.13",
"yaml-cpp/0.7.0",
"marisa/0.2.6",
"zlib/1.2.13",
"libcurl/7.86.0",
"glog/0.6.0",
"fmt/9.1.0",
"gflags/2.2.2",
"double-conversion/3.2.1",
"libevent/2.1.12",
"libdwarf/20191104",
"libiberty/9.1.0",
"libsodium/cci.20220430",
"xsimd/9.0.1",
"xz_utils/5.4.0",
"prometheus-cpp/1.1.0",
"re2/20230301",
"folly/2023.10.30.08@milvus/dev",
"rocksdb/6.29.5@milvus/dev#b1842a53ddff60240c5282a3da498ba1",
"boost/1.82.0#744a17160ebb5838e9115eab4d6d0c06",
"onetbb/2021.9.0#4a223ff1b4025d02f31b65aedf5e7f4a",
"nlohmann_json/3.11.2#ffb9e9236619f1c883e36662f944345d",
"zstd/1.5.4#308b8b048f9a3823ce248f9c150cc889",
"lz4/1.9.4#c5afb86edd69ac0df30e3a9e192e43db",
"snappy/1.1.9#0519333fef284acd04806243de7d3070",
"lzo/2.10#9517fc1bcc4d4cc229a79806003a1baa",
"arrow/15.0.0#0456d916ff25d509e0724c5b219b4c45",
"openssl/3.1.2#02594c4c0a6e2b4feb3cd15119993597",
"aws-sdk-cpp/1.9.234#28d6d2c175975900ce292bafe8022c88",
"googleapis/cci.20221108#65604e1b3b9a6b363044da625b201a2a",
"benchmark/1.7.0#459f3bb1a64400a886ba43047576df3c",
"gtest/1.13.0#f9548be18a41ccc6367efcb8146e92be",
"protobuf/3.21.4#fd372371d994b8585742ca42c12337f9",
"rapidxml/1.13#10c11a4bfe073e131ed399d5c4f2e075",
"yaml-cpp/0.7.0#9c87b3998de893cf2e5a08ad09a7a6e0",
"marisa/0.2.6#68446854f5a420672d21f21191f8e5af",
"zlib/1.2.13#df233e6bed99052f285331b9f54d9070",
"libcurl/7.86.0#bbc887fae3341b3cb776c601f814df05",
"glog/0.6.0#d22ebf9111fed68de86b0fa6bf6f9c3f",
"fmt/9.1.0#95259249fb7ef8c6b5674a40b00abba3",
"gflags/2.2.2#b15c28c567c7ade7449cf994168a559f",
"double-conversion/3.2.1#640e35791a4bac95b0545e2f54b7aceb",
"libevent/2.1.12#4fd19d10d3bed63b3a8952c923454bc0",
"libdwarf/20191104#7f56c6c7ccda5fadf5f28351d35d7c01",
"libiberty/9.1.0#3060045a116b0fff6d4937b0fc9cfc0e",
"libsodium/cci.20220430#7429a9e5351cc67bea3537229921714d",
"xsimd/9.0.1#ac9fd02a381698c4e08c5c4ca03b73e1",
"xz_utils/5.4.0#a6d90890193dc851fa0d470163271c7a",
"prometheus-cpp/1.1.0#ea9b101cb785943adb40ad82eda7856c",
"re2/20230301#f8efaf45f98d0193cd0b2ea08b6b4060",
"folly/2023.10.30.08@milvus/dev#81d7729cd4013a1b708af3340a3b04d9",
"google-cloud-cpp/2.5.0@milvus/2.4#b8dda0943d40adee69d7adc5fafc317d",
"opentelemetry-cpp/1.8.3@milvus/2.4#3b8139532791a163c8ff2819c55eb4ac",
"librdkafka/1.9.1",
"abseil/20230125.3",
"roaring/3.0.0",
"librdkafka/1.9.1#e24dcbb0a1684dcf5a56d8d0692ceef3",
"abseil/20230125.3#dad7cc4c83bbd44c1f1cc9cc4d97ac88",
"roaring/3.0.0#25a703f80eda0764a31ef939229e202d",
"grpc/1.54.3@milvus/dev#5dfb5e1477b22c6d1e6d6b90ab5501d8",
)
generators = ("cmake", "cmake_find_package")

6
scripts/3rdparty_build.sh
View File

@ -52,16 +52,16 @@ 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 default-conan-local -u || { 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 default-conan-local -u || { 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 default-conan-local -u || { echo 'conan install failed'; exit 1; }
fi
;;
*)