From 12f08e40ee677f4b6d49cdfd5e4b95dd335630e8 Mon Sep 17 00:00:00 2001 From: Hiroaki Yutani Date: Fri, 16 Oct 2020 00:49:58 +0900 Subject: [PATCH 1/3] Do not use RStudio Package Manager for R-devel --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 438d6c3ac1..8c8c079fdc 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -10,7 +10,7 @@ name: R-CMD-check # Increment this version when we want to clear cache env: - cache-version: v3 + cache-version: v4 jobs: R-CMD-check: @@ -24,7 +24,7 @@ jobs: config: - {os: windows-latest, r: '4.0', vdiffr: true, xref: true} - {os: macOS-latest, r: '4.0', vdiffr: true, xref: true} - - {os: ubuntu-16.04, r: 'devel', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions"} + - {os: ubuntu-16.04, r: 'devel', vdiffr: false, xref: true} - {os: ubuntu-16.04, r: '4.0', vdiffr: true, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - {os: ubuntu-16.04, r: '3.6', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} - {os: ubuntu-16.04, r: '3.5', vdiffr: false, xref: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} From 19409c2fdbfec35f06542864bd03ff4ccbfc7674 Mon Sep 17 00:00:00 2001 From: Hiroaki Yutani Date: Sat, 17 Oct 2020 11:58:56 +0900 Subject: [PATCH 2/3] Skip test when xml2 is not available --- tests/testthat/test-ggsave.R | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/testthat/test-ggsave.R b/tests/testthat/test-ggsave.R index 6d60439686..e5c957e0d9 100644 --- a/tests/testthat/test-ggsave.R +++ b/tests/testthat/test-ggsave.R @@ -32,6 +32,7 @@ test_that("ggsave uses theme background as image background", { # FIXME: This should check svglite, but, at the time of writing this, there's already a binary # package of svglite, and it can be installed even if the dependency is not available, surprisingly... skip_if_not_installed("systemfonts") + skip_if_not_installed("xml2") path <- tempfile() on.exit(unlink(path)) From 55445818897e9f1aa66417953ebbeeafb7950f66 Mon Sep 17 00:00:00 2001 From: Hiroaki Yutani Date: Sat, 17 Oct 2020 11:59:30 +0900 Subject: [PATCH 3/3] Remove workaround for systemfonts --- tests/testthat/test-ggsave.R | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/testthat/test-ggsave.R b/tests/testthat/test-ggsave.R index e5c957e0d9..491e8f5913 100644 --- a/tests/testthat/test-ggsave.R +++ b/tests/testthat/test-ggsave.R @@ -29,9 +29,6 @@ test_that("ggsave restores previous graphics device", { }) test_that("ggsave uses theme background as image background", { - # FIXME: This should check svglite, but, at the time of writing this, there's already a binary - # package of svglite, and it can be installed even if the dependency is not available, surprisingly... - skip_if_not_installed("systemfonts") skip_if_not_installed("xml2") path <- tempfile()