From 51bcb669b83685d3e7c435950302c3f57a0dbffd Mon Sep 17 00:00:00 2001 From: Vasily Sviridov Date: Fri, 29 May 2026 16:54:38 +0300 Subject: [PATCH 1/2] feat: enable clickhouse by default and require clickhouse-cpp >= 2.6.0 --- conanfile.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8d4f042ad106..b788190452d7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -60,7 +60,7 @@ class UserverConan(ConanFile): 'with_redis': True, 'with_redis_tls': True, 'with_grpc': True, - 'with_clickhouse': False, # TODO: set to True after clickhouse-cpp >= 2.6 appears in Conan Center + 'with_clickhouse': True, 'with_rabbitmq': True, 'with_utest': True, 'with_kafka': True, @@ -159,10 +159,7 @@ def requirements(self): if self.options.with_rabbitmq: self.requires('amqp-cpp/[^4.3]') if self.options.with_clickhouse: - # Some C++ Standard libraries require the following fix - # https://github.com/ClickHouse/clickhouse-cpp/commit/2ac94d0d5d425cd70a0a8f4f91c4ed57369b72b9 - # self.requires('clickhouse-cpp/[>=2.6.0 <3]') - self.requires('clickhouse-cpp/[>=2.5.1 <3]') + self.requires('clickhouse-cpp/[>=2.6.0 <3]') if self.options.with_utest: self.requires( 'gtest/[>=1.15 <3]', From 37d0918200adecf8f24ed3cd0392ef7ed683ffd7 Mon Sep 17 00:00:00 2001 From: Vasily Sviridov Date: Fri, 29 May 2026 23:47:39 +0300 Subject: [PATCH 2/2] wip --- conanfile.py | 1 + 1 file changed, 1 insertion(+) diff --git a/conanfile.py b/conanfile.py index b788190452d7..e78122266fe1 100644 --- a/conanfile.py +++ b/conanfile.py @@ -160,6 +160,7 @@ def requirements(self): self.requires('amqp-cpp/[^4.3]') if self.options.with_clickhouse: self.requires('clickhouse-cpp/[>=2.6.0 <3]') + self.requires('lz4/[^1.10.0]', force=True) if self.options.with_utest: self.requires( 'gtest/[>=1.15 <3]',