This is an automated email from the ASF dual-hosted git repository. uwe 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 b4698e6 ARROW-5919: [R] Test R-in-conda as a nightly build b4698e6 is described below commit b4698e6e7513dd83053542e195cd5c112e8b8947 Author: Uwe L. Korn <uwe.k...@quantco.com> AuthorDate: Mon Jul 15 11:16:11 2019 +0200 ARROW-5919: [R] Test R-in-conda as a nightly build Author: Uwe L. Korn <uwe.k...@quantco.com> Author: Uwe L. Korn <xho...@users.noreply.github.com> Closes #4855 from xhochy/conda-r-docker and squashes the following commits: b3189b863 <Uwe L. Korn> Add LICENSE to conda_env_r 971181dec <Uwe L. Korn> Add to nightlies 743aa5955 <Uwe L. Korn> Update Dockerfile.conda b79e0c08e <Uwe L. Korn> ARROW-XXXX: Test R-in-conda as a nightly build --- ci/conda_env_r.yml | 36 ++++++++++++++++++++++++++++++++++++ dev/tasks/tests.yml | 11 +++++++++++ docker-compose.yml | 15 +++++++++++++++ r/Dockerfile.conda | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/ci/conda_env_r.yml b/ci/conda_env_r.yml new file mode 100644 index 0000000..0eff8a3 --- /dev/null +++ b/ci/conda_env_r.yml @@ -0,0 +1,36 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +r-assertthat +r-base +r-bit64 +r-fs +r-purrr +r-r6 +r-rcpp >=0.12.18.2 +r-rlang +r-tidyselect +# Test dependencies +pandoc +r-covr +r-hms +r-lubridate +r-pkgdown +r-rmarkdown +r-roxygen2 +r-testthat +r-tibble diff --git a/dev/tasks/tests.yml b/dev/tasks/tests.yml index 32e2ed5..9674437 100644 --- a/dev/tasks/tests.yml +++ b/dev/tasks/tests.yml @@ -20,6 +20,7 @@ groups: # makes it easier to submit related tasks docker: - docker-r + - docker-r-conda - docker-rust - docker-cpp - docker-cpp-alpine @@ -88,6 +89,16 @@ tasks: - docker-compose build r - docker-compose run r + docker-r-conda: + ci: circle + platform: linux + template: docker-tests/circle.linux.yml + params: + commands: + - docker-compose build cpp + - docker-compose build r-conda + - docker-compose run r-conda + docker-rust: ci: circle platform: linux diff --git a/docker-compose.yml b/docker-compose.yml index 3b50cd1..d2c6029 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -400,6 +400,21 @@ services: dockerfile: r/Dockerfile volumes: *ubuntu-volumes + r-conda: + # Usage: + # export R_VERSION=3.5.1 + # docker-compose build cpp + # docker-compose build r-conda + # docker-compose run r-conda + image: arrow:r-conda-${R_VERSION:-3.5.1} + shm_size: 2G + build: + context: . + dockerfile: r/Dockerfile.conda + args: + R_VERSION: ${R_VERSION:-3.5.1} + volumes: *ubuntu-volumes + ######################### Tools and Linters ################################# # TODO(kszucs): site diff --git a/r/Dockerfile.conda b/r/Dockerfile.conda new file mode 100644 index 0000000..2c664eb --- /dev/null +++ b/r/Dockerfile.conda @@ -0,0 +1,34 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +FROM arrow:cpp + +# install R specific packages +ARG R_VERSION=3.5.1 +COPY ci/conda_env_r.yml /arrow/ci/ +RUN conda install -q \ + --file arrow/ci/conda_env_r.yml \ + r-base=$R_VERSION \ + nomkl && \ + conda clean --all + +ENV ARROW_PYTHON=OFF \ + ARROW_BUILD_TESTS=OFF + +# build, install, test R package +CMD ["/bin/bash", "-c", "/arrow/ci/docker_build_cpp.sh && \ + /arrow/ci/docker_build_r.sh"]