This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 28935cf535 ARROW-17845: [CI][Conan] Re-enable Flight in Conan CI check
(#14240)
28935cf535 is described below
commit 28935cf535412d368ab79312938e8bcc7c1dc80d
Author: Will Jones <[email protected]>
AuthorDate: Mon Sep 26 13:01:43 2022 -0700
ARROW-17845: [CI][Conan] Re-enable Flight in Conan CI check (#14240)
Authored-by: Will Jones <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
ci/conan/all/conanfile.py | 2 +-
dev/tasks/tasks.yml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
index aa832ab681..26abcc028b 100644
--- a/ci/conan/all/conanfile.py
+++ b/ci/conan/all/conanfile.py
@@ -314,7 +314,7 @@ class ArrowConan(ConanFile):
if self.options.get_safe("with_gcs"):
self.requires("google-cloud-cpp/1.40.1")
if self._with_grpc():
- self.requires("grpc/1.47.0")
+ self.requires("grpc/1.48.0")
if self.options.with_json:
self.requires("rapidjson/1.1.0")
if self._with_llvm():
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 3771dfddab..8b0b338ee8 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -205,12 +205,11 @@ tasks:
ci: github
template: docker-tests/github.linux.yml
params:
- # ARROW-17395: Enable this again when grpc is updated.
- # -e ARROW_CONAN_WITH_FLIGHT_RPC=True
flags: >-
-e ARROW_CONAN_PARQUET=True
-e ARROW_CONAN_WITH_BROTLI=True
-e ARROW_CONAN_WITH_BZ2=True
+ -e ARROW_CONAN_WITH_FLIGHT_RPC=True
-e ARROW_CONAN_WITH_GLOG=True
-e ARROW_CONAN_WITH_JEMALLOC=True
-e ARROW_CONAN_WITH_JSON=True
