You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by we...@apache.org on 2019/06/20 02:16:16 UTC
[arrow] branch master updated: ARROW-5652: [CI] Fix lint docker
image
This is an automated email from the ASF dual-hosted git repository.
wesm 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 cd88d2e ARROW-5652: [CI] Fix lint docker image
cd88d2e is described below
commit cd88d2efba659217c4f5019c1a52d22f7982a234
Author: Wes McKinney <we...@apache.org>
AuthorDate: Wed Jun 19 21:16:09 2019 -0500
ARROW-5652: [CI] Fix lint docker image
Author: Wes McKinney <we...@apache.org>
Author: François Saint-Jacques <fs...@gmail.com>
Closes #4617 from fsaintjacques/ARROW-5652-iwyu-docker and squashes the following commits:
7dc73a943 <Wes McKinney> Install Gandiva dependencies in cpp/Dockerfile instead
769643dbc <François Saint-Jacques> ARROW-5652: Fix lint docker image
---
cpp/Dockerfile | 4 +++-
dev/lint/Dockerfile | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/cpp/Dockerfile b/cpp/Dockerfile
index a570047..dcef560 100644
--- a/cpp/Dockerfile
+++ b/cpp/Dockerfile
@@ -39,18 +39,20 @@ ENV PATH=/opt/conda/bin:$PATH \
CONDA_PREFIX=/opt/conda
COPY ci/docker_install_conda.sh \
ci/conda_env_cpp.yml \
+ ci/conda_env_gandiva.yml \
ci/conda_env_unix.yml \
/arrow/ci/
RUN arrow/ci/docker_install_conda.sh && \
conda install -q -c conda-forge \
--file arrow/ci/conda_env_cpp.yml \
+ --file arrow/ci/conda_env_gandiva.yml \
--file arrow/ci/conda_env_unix.yml \
$EXTRA_CONDA_PKGS && \
conda clean --all
ENV CC=gcc \
CXX=g++ \
- ARROW_GANDIVA=OFF \
+ ARROW_GANDIVA=ON \
ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=CONDA \
ARROW_HOME=$CONDA_PREFIX \
diff --git a/dev/lint/Dockerfile b/dev/lint/Dockerfile
index ae229d5..c9658b8 100644
--- a/dev/lint/Dockerfile
+++ b/dev/lint/Dockerfile
@@ -30,4 +30,4 @@ RUN conda install flake8 && \
ENV PATH=/opt/iwyu/bin:$PATH
ADD ci/docker_install_iwyu.sh /arrow/ci/
-RUN arrow/ci/docker_install_iwyu.sh
+RUN arrow/ci/docker_install_iwyu.sh
\ No newline at end of file