From d89f0bd26b92eb09c4909b4b3bf0d7d7ecfc57a5 Mon Sep 17 00:00:00 2001 From: PengZheng Date: Tue, 5 Dec 2023 12:47:12 +0800 Subject: [PATCH 1/4] Add zeromq version conflict in Conan Create CI. --- conanfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index f8288bca6..3b37f058a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -381,7 +381,6 @@ def requirements(self): if self.options.build_cxx_remote_service_admin: self.requires("rapidjson/[>=1.1.0 <2.0.0]") if self.options.build_pubsub_psa_zmq: - self.requires("zeromq/4.3.4") self.requires("czmq/4.2.0") if self.options.build_http_admin or self.options.build_rsa_discovery_common \ or self.options.build_rsa_remote_service_admin_dfi: From 41034d81fb0b1706fe84e3e1eed07e92457e93fc Mon Sep 17 00:00:00 2001 From: PengZheng Date: Tue, 5 Dec 2023 13:05:11 +0800 Subject: [PATCH 2/4] Fix zeromq version conflict in Conan Create CI. --- conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.py b/conanfile.py index 3b37f058a..507d742c6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -381,6 +381,7 @@ def requirements(self): if self.options.build_cxx_remote_service_admin: self.requires("rapidjson/[>=1.1.0 <2.0.0]") if self.options.build_pubsub_psa_zmq: + self.requires("zeromq/[>=4.3.5 <5.0.0]") self.requires("czmq/4.2.0") if self.options.build_http_admin or self.options.build_rsa_discovery_common \ or self.options.build_rsa_remote_service_admin_dfi: From 15751847eeb4b2518feafa919e3abba322ee82d0 Mon Sep 17 00:00:00 2001 From: PengZheng Date: Tue, 5 Dec 2023 13:44:50 +0800 Subject: [PATCH 3/4] Add libuuid version conflict in Conan Create CI. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 507d742c6..661aee660 100644 --- a/conanfile.py +++ b/conanfile.py @@ -369,7 +369,7 @@ def requirements(self): if self.options.build_utils: self.requires("libzip/[>=1.7.3 <2.0.0]") if self.options.build_framework or self.options.build_pubsub: - self.requires("util-linux-libuuid/2.39") + self.requires("util-linux-libuuid/[>=2.39 <3.0.0]") if ((self.options.build_framework and self.options.framework_curlinit) or self.options.build_celix_etcdlib or self.options.build_rsa_discovery_common or self.options.build_rsa_remote_service_admin_dfi From 64521b716d70da0f07e05a43c27c48917899394d Mon Sep 17 00:00:00 2001 From: PengZheng Date: Tue, 5 Dec 2023 13:58:21 +0800 Subject: [PATCH 4/4] Add zeromq version conflict in Conan Create CI. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 661aee660..75c9b1bac 100644 --- a/conanfile.py +++ b/conanfile.py @@ -381,7 +381,7 @@ def requirements(self): if self.options.build_cxx_remote_service_admin: self.requires("rapidjson/[>=1.1.0 <2.0.0]") if self.options.build_pubsub_psa_zmq: - self.requires("zeromq/[>=4.3.5 <5.0.0]") + self.requires("zeromq/[>=4.3.4 <5.0.0]") self.requires("czmq/4.2.0") if self.options.build_http_admin or self.options.build_rsa_discovery_common \ or self.options.build_rsa_remote_service_admin_dfi: