Skip to content

Commit

Permalink
Revert changes on linux-apt-r.dockerfile and try with Ubuntu 24.04 as…
Browse files Browse the repository at this point in the history
… suggested
  • Loading branch information
raulcd committed Sep 12, 2024
1 parent e213c69 commit 4bd0bfb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ jobs:
fail-fast: false
matrix:
r: ["4.4"]
ubuntu: [22.04]
ubuntu: [24.04]
force-tests: ["true"]
env:
R: ${{ matrix.r }}
Expand Down
25 changes: 8 additions & 17 deletions ci/docker/linux-apt-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,11 @@ RUN apt-get update -y && \
# R CMD CHECK --as-cran needs pdflatex to build the package manual
texlive-latex-base \
# Need locales so we can set UTF-8
locales && \
locales \
# Need Python to check py-to-r bridge
python3 \
python3-pip \
python3-dev && \
locale-gen en_US.UTF-8 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand All @@ -77,22 +81,9 @@ RUN cat /arrow/ci/etc/rprofile >> $(R RHOME)/etc/Rprofile.site
# Also ensure parallel compilation of C/C++ code
RUN echo "MAKEFLAGS=-j$(R -s -e 'cat(parallel::detectCores())')" >> $(R RHOME)/etc/Renviron.site

ARG ubuntu
ARG python="3.12"
COPY ci/scripts/install_python.sh /arrow/ci/scripts/
# Need Python to check py-to-r bridge. Ubuntu 20.04 uses
# python 3.8 which is unsuported for pyarrow
RUN if [ "${ubuntu}" = "20.04" ]; then \
/arrow/ci/scripts/install_python.sh linux ${python}; \
else \
apt update ${quiet} && \
apt-get install -y \
python3 \
python3-pip \
python3-dev && \
apt clean && \
rm -rf /var/lib/apt/lists/* \
; fi
# Set up Python 3 and its dependencies
RUN ln -s /usr/bin/python3 /usr/local/bin/python && \
ln -s /usr/bin/pip3 /usr/local/bin/pip

COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
COPY r/DESCRIPTION /arrow/r/
Expand Down

0 comments on commit 4bd0bfb

Please sign in to comment.