From aee7fc1a2e615129a093a646ec44e49faeb71477 Mon Sep 17 00:00:00 2001
From: Hiroaki Yutani <yutani.ini@gmail.com>
Date: Fri, 1 May 2020 20:28:40 +0900
Subject: [PATCH] Explicitly specify the R version on test-coverage action

---
 .github/workflows/test-coverage.yaml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
index 5bd280c103..d8576b7ed4 100644
--- a/.github/workflows/test-coverage.yaml
+++ b/.github/workflows/test-coverage.yaml
@@ -11,12 +11,15 @@ name: test-coverage
 # Increment this version when we want to clear cache
 env:
   cache-version: v1
+  r-version: 4.0
 
 jobs:
   test-coverage:
     runs-on: macOS-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          r-version: ${{ env.r-version }}
 
       - uses: r-lib/actions/setup-r@master
 
@@ -32,8 +35,8 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ env.cache-version }}-macOS-r-3.6-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ env.cache-version }}-macOS-r-3.6-
+          key: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ env.cache-version }}-macOS-r-${{ env.r-version }}-
 
       - name: Install system dependencies on macOS
         if: runner.os == 'macOS'
@@ -53,13 +56,6 @@ jobs:
             brew install udunits gdal
           fi
 
-      # TODO: Remove this when https://github.com/r-lib/xml2/issues/296 is fixed on CRAN
-      - name: Install the dev version of xml2 as a workaround
-        if: runner.os == 'macOS' && matrix.config.r == 'devel'
-        run: |
-          remotes::install_github('r-lib/xml2')
-        shell: Rscript {0}
-
       - name: Install dependencies
         run: |
           install.packages(c("remotes"))