Skip to content

Commit e16257c

Browse files
authored
fix: pin conan recipe revisions and enable shared libs for openssl/gflags (#68)
Signed-off-by: xiaofanluan <xiaofan.luan@zilliz.com>
1 parent 017f2d2 commit e16257c

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

conanfile.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ class MilvusCommonConan(ConanFile):
2020
"prometheus-cpp/1.2.4",
2121
"libcurl/8.10.1",
2222
"gflags/2.2.2",
23-
"opentelemetry-cpp/1.23.0@milvus/dev",
24-
"grpc/1.67.1@milvus/dev",
23+
"opentelemetry-cpp/1.23.0@milvus/dev#bcd65b63b8db8447178ed93bbc94dcc0",
24+
"grpc/1.67.1@milvus/dev#5aa62c51bced448b83d7db9e5b3a13c7",
2525
"abseil/20250127.0",
2626
"xz_utils/5.4.5",
2727
"zlib/1.3.1",
2828
"libevent/2.1.12",
2929
"openssl/3.3.2",
30-
"folly/2024.08.12.00@milvus/dev",
30+
"folly/2024.08.12.00@milvus/dev#e09fc71826ce6b4568441910665f0889",
3131
"boost/1.83.0"
3232
)
3333

@@ -39,6 +39,8 @@ class MilvusCommonConan(ConanFile):
3939
default_options = {
4040
"folly:shared": True,
4141
"gtest:build_gmock": True,
42+
"openssl:shared": True,
43+
"gflags:shared": True,
4244
"glog:with_gflags": True,
4345
"glog:shared": True,
4446
"prometheus-cpp:with_pull": False,
@@ -51,7 +53,7 @@ class MilvusCommonConan(ConanFile):
5153
def requirements(self):
5254
# Force all dependencies to use protobuf from milvus/dev channel
5355
# This is needed to resolve conflicts between opentelemetry-cpp and grpc
54-
self.requires("protobuf/5.27.0@milvus/dev", force=True, override=True)
56+
self.requires("protobuf/5.27.0@milvus/dev#6fff8583e2fe32babef04a9097f1d581", force=True, override=True)
5557
self.requires("lz4/1.9.4", force=True, override=True)
5658
if self.settings.os != "Macos":
5759
self.requires("libunwind/1.8.1")

0 commit comments

Comments
 (0)