Fix CI failures (#4046)

tidyverse · Jun 9, 2020 · 01df437 · 01df437
1 parent 628f264
commit 01df437
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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: v1
+ cache-version: v2
 
 jobs:
  R-CMD-check:
@@ -77,6 +77,11 @@ jobs:
  sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
  sudo -s eval "$sysreqs"
 
+ # Remove this when the new rmarkdown is released on CRAN
+ - name: "Workaround for rstudio/rmarkdown#1831"
+ if: runner.os == 'Linux' && matrix.config.r < '3.6'
+ run: Rscript -e "remotes::install_github('rstudio/rmarkdown')"
+
  - name: Install system dependencies on macOS
  if: runner.os == 'macOS'
  run: |

diff --git a/.travis.yml b/.travis.yml
@@ -26,6 +26,9 @@ env:
  # switch off vdiffr by default
  - VDIFFR_RUN_TESTS=false
 
+# Workaround for rstudio/rmarkdown#1831
+r_github_packages: rstudio/rmarkdown
+
 after_success:
  - Rscript -e 'covr::codecov()'