Skip to content

Commit 818cf80

Browse files
Test R 4.0 on CI (#3961)
1 parent 550360b commit 818cf80

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
config:
25-
- {os: windows-latest, r: '3.6', vdiffr: true}
26-
- {os: macOS-latest, r: '3.6', vdiffr: true}
27-
- {os: macOS-latest, r: 'devel', vdiffr: false}
28-
- {os: ubuntu-16.04, r: '3.2', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
29-
- {os: ubuntu-16.04, r: '3.3', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
30-
- {os: ubuntu-16.04, r: '3.4', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
31-
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
32-
- {os: ubuntu-16.04, r: '3.6', vdiffr: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
25+
- {os: windows-latest, r: '4.0', vdiffr: true}
26+
- {os: macOS-latest, r: '4.0', vdiffr: true}
27+
- {os: macOS-latest, r: 'devel', vdiffr: false}
28+
- {os: ubuntu-16.04, r: '4.0', vdiffr: true, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
29+
- {os: ubuntu-16.04, r: '3.6', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
30+
- {os: ubuntu-16.04, r: '3.5', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
31+
- {os: ubuntu-16.04, r: '3.4', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
32+
- {os: ubuntu-16.04, r: '3.3', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
33+
- {os: ubuntu-16.04, r: '3.2', vdiffr: false, cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
3334

3435
env:
3536
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -68,6 +69,10 @@ jobs:
6869
env:
6970
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
7071
run: |
72+
# Use cran:libgit2 PPA to avoid conflicts of libcurl4-gnutls-dev
73+
# Remove this after https://github.com/r-lib/actions/pull/97 gets merged
74+
sudo add-apt-repository ppa:cran/libgit2
75+
7176
Rscript -e "remotes::install_github('r-hub/sysreqs')"
7277
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
7378
sudo -s eval "$sysreqs"
@@ -90,13 +95,6 @@ jobs:
9095
brew install udunits gdal
9196
fi
9297
93-
# TODO: Remove this when https://github.com/r-lib/xml2/issues/296 is fixed on CRAN
94-
- name: Install the dev version of xml2 as a workaround
95-
if: runner.os == 'macOS' && matrix.config.r == 'devel'
96-
run: |
97-
remotes::install_github('r-lib/xml2')
98-
shell: Rscript {0}
99-
10098
- name: Install dependencies
10199
run: |
102100
remotes::install_deps(dependencies = TRUE)

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ matrix:
1111
env:
1212
- VDIFFR_RUN_TESTS=true
1313
- VDIFFR_LOG_PATH="../vdiffr.Rout.fail"
14+
- r: 3.6
1415
- r: 3.5
1516
- r: 3.4
1617
- r: 3.3

0 commit comments

Comments
 (0)