Skip to content

Commit a9114be

Browse files
ARROW-7341: [CI] Unbreak nightly Conda R job
One fix, one minor improvement, and also alphabetizing the env vars. Closes #5985 from nealrichardson/unbreak-r-conda and squashes the following commits: 61c36b1 <Neal Richardson> Set UTF-8 a45fe3b <Neal Richardson> Unbreak nightly Conda R job Authored-by: Neal Richardson <[email protected]> Signed-off-by: Neal Richardson <[email protected]>
1 parent fe41a68 commit a9114be

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

ci/docker/conda-r.dockerfile

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ ARG repo
1919
ARG arch
2020
FROM ${repo}:${arch}-conda-cpp
2121

22+
# Need locales so we can set UTF-8
23+
RUN apt-get update -y && \
24+
apt-get install -y locales && \
25+
locale-gen en_US.UTF-8 && \
26+
apt-get clean && \
27+
rm -rf /var/lib/apt/lists/*
28+
2229
# install R specific packages
2330
ARG r=3.6.1
2431
COPY ci/conda_env_r.yml /arrow/ci/
@@ -28,18 +35,18 @@ RUN conda install -q \
2835
nomkl && \
2936
conda clean --all
3037

31-
# Ensure parallel compilation of each individual package
32-
RUN printf "\nMAKEFLAGS=-j8\n" >> $CONDA_PREFIX/lib/R/etc/Makeconf
38+
# Ensure parallel compilation of of C/C++ code
39+
RUN echo "MAKEFLAGS=-j$(R --slave -e 'cat(parallel::detectCores())')" >> $CONDA_PREFIX/lib/R/etc/Makeconf
3340

3441
ENV ARROW_BUILD_STATIC=OFF \
3542
ARROW_BUILD_TESTS=OFF \
3643
ARROW_BUILD_UTILITIES=OFF \
3744
ARROW_DEPENDENCY_SOURCE=SYSTEM \
3845
ARROW_FLIGHT=OFF \
3946
ARROW_GANDIVA=OFF \
47+
ARROW_NO_DEPRECATED_API=ON \
4048
ARROW_ORC=OFF \
4149
ARROW_PARQUET=ON \
4250
ARROW_PLASMA=OFF \
4351
ARROW_USE_GLOG=OFF \
44-
ARROW_NO_DEPRECATED_API=ON \
45-
ARROW_R_DEV=TRUE
52+
LC_ALL=en_US.UTF-8

0 commit comments

Comments
 (0)