Skip to content

Commit

Permalink
Update 4.2 -> 4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
thisisnic committed Sep 7, 2023
1 parent 65e2f22 commit 7fb2c70
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ NUMBA=latest
NUMPY=latest
PANDAS=latest
PYTHON=3.8
R=4.2
R=4.3
SPARK=master
TURBODBC=latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
strategy:
fail-fast: false
matrix:
r: ["4.2"]
r: ["4.3"]
ubuntu: [20.04]
force-tests: ["true"]
env:
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
timeout = 3600
)
- name: Run lintr
if: ${{ matrix.config.rversion == '4.2' }}
if: ${{ matrix.config.rversion == '4.3' }}
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.2
ARG r=4.3
ARG jdk=8

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

ARG r=4.2
ARG r=4.3
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: Only R >= 4.0 is available in this repo
Expand Down
1 change: 1 addition & 0 deletions dev/tasks/r/github.linux.versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ jobs:
- "3.6"
- "4.0"
- "4.1"
- "4.2"
env:
R_ORG: "rstudio"
R_IMAGE: "r-base"
Expand Down
8 changes: 4 additions & 4 deletions dev/tasks/tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1409,8 +1409,8 @@ tasks:

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

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

test-r-minimal-build:
Expand Down

0 comments on commit 7fb2c70

Please sign in to comment.