Skip to content

Commit

Permalink
ARROW-16281: [R] [CI] Bump versions with the release of 4.2
Browse files Browse the repository at this point in the history
Update hard-coded versions on R in our CI after the release of R 4.2.

Closes apache#12980 from dragosmg/r_42_ci_update

Authored-by: Dragoș Moldovan-Grünfeld <[email protected]>
Signed-off-by: Jonathan Keane <[email protected]>
  • Loading branch information
dragosmg authored and jonkeane committed May 18, 2022
1 parent 856a53b commit ce4dcbd
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ NODE=16
NUMPY=latest
PANDAS=latest
PYTHON=3.8
R=4.1
R=4.2
SPARK=master
TURBODBC=latest

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
fail-fast: false
matrix:
r: ["4.1"]
r: ["4.2"]
ubuntu: [20.04]
force-tests: ["true", "false"]
env:
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
config:
- { rtools: 35, rversion: "3.6" }
- { rtools: 40, rversion: "4.1" }
# TODO: Once R 4.2 comes out we can switch to devel + 4.2
- { rtools: 42, rversion: "4.2" }
- { rtools: 42, rversion: "devel" }
env:
ARROW_R_CXXFLAGS: "-Werror"
Expand Down Expand Up @@ -384,7 +384,7 @@ jobs:
timeout = 3600
)
- name: Run lintr
if: ${{ matrix.config.rversion == '4.1' }}
if: ${{ matrix.config.rversion == '4.2' }}
env:
NOT_CRAN: "true"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/linux-apt-docs.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ARG base
FROM ${base}

ARG r=4.1
ARG r=4.2
ARG jdk=8

# See R install instructions at https://cloud.r-project.org/bin/linux/ubuntu/
Expand Down
11 changes: 3 additions & 8 deletions ci/docker/linux-apt-lint.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,11 @@ RUN apt-get update && \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG r=4.1
ARG r=4.2
RUN wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
# NOTE: R 3.5 and 3.6 are available in the repos with -cran35 suffix
# for trusty, xenial, bionic, and eoan (as of May 2020)
# -cran40 has 4.0 versions for bionic and focal
# R 3.4 is available without the suffix but only for trusty and xenial
# TODO: make sure OS version and R version are valid together and conditionally set repo suffix
# This is a hack to turn 3.6 into 35, and 4.0/4.1 into 40:
add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran'$(echo "${r}" | tr -d . | tr 6 5 | tr 1 0)'/' && \
# NOTE: Only R >= 4.0 is available in this repo
add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran40/' && \
apt-get install -y \
r-base=${r}* \
r-recommended=${r}* \
Expand Down
9 changes: 2 additions & 7 deletions ci/docker/linux-apt-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,8 @@ RUN apt-get update -y && \
software-properties-common && \
wget -qO- https://cloud.r-project.org/bin/linux/ubuntu/marutter_pubkey.asc | \
tee -a /etc/apt/trusted.gpg.d/cran_ubuntu_key.asc && \
# NOTE: R 3.5 and 3.6 are available in the repos with -cran35 suffix
# for trusty, xenial, bionic, and eoan (as of May 2020)
# -cran40 has 4.0 versions for bionic and focal
# R 3.4 is available without the suffix but only for trusty and xenial
# TODO: make sure OS version and R version are valid together and conditionally set repo suffix
# This is a hack to turn 3.6 into 35, and 4.0/4.1 into 40:
add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran'$(echo "${r}" | tr -d . | tr 6 5 | tr 1 0)'/' && \
# NOTE: Only R >= 4.0 is available in this repo
add-apt-repository 'deb https://cloud.r-project.org/bin/linux/ubuntu '$(lsb_release -cs)'-cran40/' && \
apt-get install -y \
r-base=${r}* \
r-recommended=${r}* \
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/r/github.linux.arrow.version.back.compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ jobs:
config:
# We use the R version that was released at the time of the arrow release in order
# to make sure we can download binaries from RSPM.
- { old_arrow_version: '7.0.0', r: '4.1' }
- { old_arrow_version: '6.0.1', r: '4.1' }
- { old_arrow_version: '5.0.0', r: '4.1' }
- { old_arrow_version: '4.0.0', r: '4.0' }
Expand Down
3 changes: 2 additions & 1 deletion dev/tasks/r/github.linux.versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ jobs:
# We test devel, release, and oldrel in regular CI.
# This is for older versions
# glue depends on R >= 3.4, and vctrs depends on glue
- "3.4"
- "3.5"
- "3.6"
- "4.0"
- "4.1"
env:
R_ORG: "rstudio"
R_IMAGE: "r-base"
Expand Down
10 changes: 5 additions & 5 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ tasks:
template: conda-recipes/azure.win.yml
params:
config: win_64_cuda_compiler_versionNonenumpy1.18python3.7.____cpython
r_config: win_64_r_base4.1
r_config: win_64_r_base4.0
artifacts:
- arrow-cpp-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2
- pyarrow-{no_rc_version}-py37(h[a-z0-9]+)_0_cpu.tar.bz2
Expand Down Expand Up @@ -1298,9 +1298,9 @@ tasks:

{% for r_org, r_image, r_tag in [("rhub", "ubuntu-gcc-release", "latest"),
("rocker", "r-base", "latest"),
("rstudio", "r-base", "4.1-focal"),
("rstudio", "r-base", "4.2-focal"),
("rstudio", "r-base", "4.1-opensuse15"),
("rstudio", "r-base", "4.1-opensuse42")] %}
("rstudio", "r-base", "4.2-opensuse42")] %}
test-r-{{ r_org }}-{{ r_image }}-{{ r_tag }}:
ci: azure
template: r/azure.linux.yml
Expand Down Expand Up @@ -1352,13 +1352,13 @@ tasks:
GCC_VERSION: 12
image: ubuntu-r-only-r

test-r-rstudio-r-base-4.1-centos7-devtoolset-8:
test-r-rstudio-r-base-4.2-centos7-devtoolset-8:
ci: azure
template: r/azure.linux.yml
params:
r_org: rstudio
r_image: r-base
r_tag: 4.1-centos7
r_tag: 4.2-centos7
devtoolset_version: 8

test-r-minimal-build:
Expand Down

0 comments on commit ce4dcbd

Please sign in to comment.