You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/08/12 04:58:53 UTC
[arrow] branch master updated: ARROW-17357: [CI][Conan] Enable JSON (#13823)
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 691775d9c8 ARROW-17357: [CI][Conan] Enable JSON (#13823)
691775d9c8 is described below
commit 691775d9c85a1f00b6497536e0eb05239b543657
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Fri Aug 12 13:58:44 2022 +0900
ARROW-17357: [CI][Conan] Enable JSON (#13823)
Authored-by: Sutou Kouhei <ko...@clear-code.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
ci/scripts/conan_build.sh | 3 +++
dev/tasks/tasks.yml | 1 +
2 files changed, 4 insertions(+)
diff --git a/ci/scripts/conan_build.sh b/ci/scripts/conan_build.sh
index 3b1d9b6c97..3bdd6a0bd5 100755
--- a/ci/scripts/conan_build.sh
+++ b/ci/scripts/conan_build.sh
@@ -46,6 +46,9 @@ fi
if [ -n "${ARROW_CONAN_WITH_JEMALLOC:-}" ]; then
conan_args+=(--options arrow:with_jemalloc=${ARROW_CONAN_WITH_JEMALLOC})
fi
+if [ -n "${ARROW_CONAN_WITH_JSON:-}" ]; then
+ conan_args+=(--options arrow:with_json=${ARROW_CONAN_WITH_JSON})
+fi
if [ -n "${ARROW_CONAN_WITH_LZ4:-}" ]; then
conan_args+=(--options arrow:with_lz4=${ARROW_CONAN_WITH_LZ4})
fi
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 4a082085f5..00d41ec008 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -212,6 +212,7 @@ tasks:
-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
-e ARROW_CONAN_WITH_LZ4=True
-e ARROW_CONAN_WITH_SNAPPY=True
-e ARROW_CONAN_WITH_ZSTD=True