Skip to content

Commit

Permalink
apacheGH-38201: [CI][Packaging] Pin zlib 1.2.13 when using thrift on …
Browse files Browse the repository at this point in the history
…conan (apache#38202)

### Rationale for this change
There is a conflict between the required Zlib version when using both thrift and GRPC.

### What changes are included in this PR?

Pinning zlib when using thrifht.

### Are these changes tested?

Via archery

### Are there any user-facing changes?

No
* Closes: apache#38201

Authored-by: Raúl Cumplido <raulcumplido@gmail.com>
Signed-off-by: Jacob Wujciak-Jens <jacob@wujciak.de>
  • Loading branch information
raulcd authored and loicalleyne committed Nov 13, 2023
1 parent 502b64a commit 0212c23
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions ci/conan/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ def _with_rapidjson(self):

def requirements(self):
if self._with_thrift():
self.requires("zlib/1.2.13")
self.requires("thrift/0.17.0")
if self._with_protobuf():
self.requires("protobuf/3.21.4")
Expand Down

0 comments on commit 0212c23

Please sign in to comment.