Bring back RSPM

r-dbi · Jan 7, 2021 · 9db33cd · 9db33cd
1 parent 2c8af9b
commit 9db33cd
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -31,32 +31,32 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest,               os-nick: all,    r: 'release'}
-          - {os: windows-latest,             os-nick: all,    r: 'release'}
-          - {os: windows-latest,             os-nick: all,    r: 'oldrel'}
-          - {os: ubuntu-, os-version: 20.04, os-nick: focal,  r: 'release'}
-          - {os: ubuntu-, os-version: 18.04, os-nick: bionic, r: 'release'}
-          - {os: ubuntu-, os-version: 16.04, os-nick: xenial, r: 'release'}
-          - {os: ubuntu-, os-version: 16.04, os-nick: xenial, r: 'devel', 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-, os-version: 16.04, os-nick: xenial, r: 'oldrel'}
+          - {os: macOS-latest,                 r: 'release'}
+          - {os: windows-latest,               r: 'release', rspm: "https://packagemanager.rstudio.com/all/latest" }
+          - {os: windows-latest,               r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/all/latest" }
+          - {os: ubuntu-, os-version: 20.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+          - {os: ubuntu-, os-version: 18.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
+          - {os: ubuntu-, os-version: 16.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
+          - {os: ubuntu-, os-version: 16.04,   r: 'devel',   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-, os-version: 16.04,   r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
 
           # Begin custom: R 3.5
-          - {os: ubuntu-, os-version: 16.04, os-nick: xenial, r: '3.5'}
+          - {os: ubuntu-, os-version: 16.04,   r: '3.5',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
           # End custom: R 3.5
 
           # Begin custom: R 3.4
-          - {os: ubuntu-, os-version: 16.04, os-nick: xenial, r: '3.4'}
+          - {os: ubuntu-, os-version: 16.04,   r: '3.4',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
           # End custom: R 3.4
 
           # Begin custom: R 3.3
-          - {os: ubuntu-, os-version: 16.04, os-nick: xenial, r: '3.3'}
+          - {os: ubuntu-, os-version: 16.04,   r: '3.3',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
           # End custom: R 3.3
 
           # Begin custom: matrix elements
           # End custom: matrix elements
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
-      RSPM: "https://packagemanager.rstudio.com/cran/__linux__/${{matrix.config.os-nick}}/latest"
+      RSPM: ${{ matrix.config.rspm }}
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       # prevent rgl issues because no X11 display is available
       RGL_USE_NULL: true
@@ -96,8 +96,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.R_LIBS_USER }}
-          key: ${{ matrix.config.os }}-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
-          restore-keys: ${{ matrix.config.os }}-${{ hashFiles('.github/R-version') }}-2-
+          key: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-2-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ matrix.config.os }}${{ matrix.config.os-version }}-${{ hashFiles('.github/R-version') }}-2-
 
       - name: Install system dependencies
         if: runner.os == 'Linux'