From 1f90bac9f2536632b25d576d13548d7f4cd58a30 Mon Sep 17 00:00:00 2001
From: Andy Teucher <andy.teucher@gov.bc.ca>
Date: Thu, 16 Apr 2020 11:01:55 -0700
Subject: [PATCH] Update actions - add r-devel - use checkout@v2 - drop texlive
 workaround - use sysreqs as much as possible

---
 .github/workflows/cmd-check.yaml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/cmd-check.yaml b/.github/workflows/cmd-check.yaml
index 38a03d2c..d8627426 100644
--- a/.github/workflows/cmd-check.yaml
+++ b/.github/workflows/cmd-check.yaml
@@ -18,6 +18,7 @@ jobs:
         config:
         - { os: windows-latest, r: '3.6', args: "'--no-manual'"}
         - { os: macOS-latest, r: '3.6', args: "c('--no-manual', '--test-dontrun')", sf_args: "--with-proj-lib=/usr/local/lib/"}
+        - { os: macOS-latest, r: 'devel', args: "c('--no-manual', '--test-dontrun')", sf_args: "--with-proj-lib=/usr/local/lib/"}
         - { os: ubuntu-16.04, r: '3.4', args: "'--no-manual'"}
         - { os: ubuntu-16.04, r: '3.5', args: "'--no-manual'"}
         - { os: ubuntu-16.04, r: '3.6'}
@@ -27,7 +28,7 @@ jobs:
       CRAN: ${{ matrix.config.cran }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
 
       - uses: r-lib/actions/setup-r@master
         with:
@@ -38,13 +39,6 @@ jobs:
       - uses: r-lib/actions/setup-tinytex@master
         if: contains(matrix.config.args, 'no-manual') == false
 
-      - name: Install texlive-scripts
-        # work around https://github.com/yihui/tinytex/issues/173 to make sure
-        # fonts are installed for building manual
-        if: contains(matrix.config.args, 'no-manual') == false
-        run: |
-          tlmgr install texlive-scripts
-
       - name: Cache R packages
         uses: actions/cache@v1
         with:
@@ -59,13 +53,21 @@ jobs:
 
       - name: Install system dependencies
         if: runner.os == 'Linux'
+        env:
+          RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
         run: |
-          sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable
-          sudo apt-get -y update
-          sudo apt-get -y install libgdal-dev gdal-bin libgeos-dev \
-          libgeos++-dev libproj-dev libudunits2-dev \
-          libcurl4-openssl-dev libssl-dev libprotobuf-dev protobuf-compiler \
-          libprotoc-dev libxml2 libxml2-dev git-core
+          Rscript -e "remotes::install_github('r-hub/sysreqs')"
+          sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
+          sudo -s eval "$sysreqs"
+
+          # install spatial dependencies
+          sudo add-apt-repository ppa:ubuntugis/ubuntugis-unstable
+          sudo apt update
+          sudo apt install \
+            libudunits2-dev \
+            libgdal-dev \
+            libgeos-dev \
+            libproj-dev
 
       - name: Install dependencies
         run: |