master -> main

.Rbuildignore

@@ -25,3 +25,4 @@
 rsconnect
 ^CRAN-RELEASE$
 ^legacy_support.txt$
+^codecov\.yml$

.github/workflows/R-CMD-check.yaml

@@ -1,121 +1,17 @@
-# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
-# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
-#
-# NOTE: This workflow is overkill for most R packages and
-# check-standard.yaml is likely a better choice.
 on:
   push:
-    branches:
-      - main
-      - master
+    branches: [main, rc-**]
   pull_request:
-    branches:
-      - main
-      - master
+    branches: [main]
   schedule:
-    - cron:  '0 0 1,11,21 * *' # every 10 days (GHA cache invalidates after 7)
+    - cron:  '0 7 * * 1' # every monday
 
-name: R-CMD-check
+name: Package checks
 
 jobs:
-
-  rversions:
-    name: R Versions
-    runs-on: ubuntu-latest
-    outputs:
-      devel:   ${{ steps.devel.outputs.installed-r-version }}
-      release: ${{ steps.release.outputs.installed-r-version }}
-      oldrel1: ${{ steps.oldrel1.outputs.installed-r-version }}
-      oldrel2: ${{ steps.oldrel2.outputs.installed-r-version }}
-      oldrel3: ${{ steps.oldrel3.outputs.installed-r-version }}
-      oldrel4: ${{ steps.oldrel4.outputs.installed-r-version }}
-    steps:
-    - { name: devel,    uses: r-lib/actions/setup-r@master, id: devel,   with: { r-version: devel,    install-r: false }}
-    - { name: release,  uses: r-lib/actions/setup-r@master, id: release, with: { r-version: release,  install-r: false }}
-    - { name: oldrel/1, uses: r-lib/actions/setup-r@master, id: oldrel1, with: { r-version: oldrel/1, install-r: false }}
-    - { name: oldrel/2, uses: r-lib/actions/setup-r@master, id: oldrel2, with: { r-version: oldrel/2, install-r: false }}
-    - { name: oldrel/3, uses: r-lib/actions/setup-r@master, id: oldrel3, with: { r-version: oldrel/3, install-r: false }}
-    - { name: oldrel/4, uses: r-lib/actions/setup-r@master, id: oldrel4, with: { r-version: oldrel/4, install-r: false }}
-
+  website:
+    uses: rstudio/shinycoreci/.github/workflows/call-website.yaml@v1
+  routine:
+    uses: rstudio/shinycoreci/.github/workflows/call-routine.yaml@v1
   R-CMD-check:
-    runs-on: ${{ matrix.config.os }}
-
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
-
-    needs:
-      - rversions
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {os: macOS-latest,   r: '${{ needs.rversions.outputs.release }}'}
-          - {os: windows-latest, r: '${{ needs.rversions.outputs.release }}'}
-          - {os: windows-latest, r: '3.6'}
-
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.devel }}', http-user-agent: "release" }
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.release }}'}
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.oldrel1 }}'}
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.oldrel2 }}'}
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.oldrel3 }}'}
-          - {os: ubuntu-20.04,   r: '${{ needs.rversions.outputs.oldrel4 }}'}
-
-          # Deliberately check on older ubuntu to maximise backward compatibility
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.devel }}', http-user-agent: "release" }
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.release }}'}
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.oldrel1 }}'}
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.oldrel2 }}'}
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.oldrel3 }}'}
-          - {os: ubuntu-18.04,   r: '${{ needs.rversions.outputs.oldrel4 }}'}
-
-    env:
-      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: '12.x'
-
-      - uses: r-lib/actions/setup-r@v1
-        id: install-r
-        with:
-          r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
-          use-public-rspm: true
-
-      - uses: r-lib/actions/setup-pandoc@v1
-
-      - uses: r-lib/actions/setup-r-dependencies@v1
-        with:
-          extra-packages: rcmdcheck
-          cache-version: 1
-
-      # Install Cairo system dependencies
-      # used for svg testing
-      - name: Mac systemdeps
-        if: runner.os == 'macOS'
-        run: |
-          brew install --cask xquartz
-          brew install cairo
-
-      - name: Check
-        env:
-          _R_CHECK_CRAN_INCOMING_: false
-        run: |
-          options(crayon.enabled = TRUE)
-          rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
-        shell: Rscript {0}
-
-      - name: Show testthat output
-        if: always()
-        run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
-        shell: bash
-
-      - name: Upload check results
-        if: failure()
-        uses: actions/upload-artifact@main
-        with:
-          name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results
-          path: check
+    uses: rstudio/shinycoreci/.github/workflows/call-R-CMD-check.yaml@v1

.github/workflows/docker.yaml

@@ -3,7 +3,8 @@ name: Docker
 on:
   push:
     branches:
-      - "master"
+      - "main"
+      - "rc-v**"
       - "docker**"
   schedule:
     - cron:  '0 0 1 * *' # first of every month
@@ -36,11 +37,11 @@ jobs:
         - name: GitHub
           # 'next' tag signifies the _next_ release
           tags: "next"
-          ref: "master"
+          ref: "main"
 
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
 
     # https://github.com/marketplace/actions/publish-docker
     - name: rstudio/plumber

DESCRIPTION

@@ -34,7 +34,6 @@ Imports:
     lifecycle (>= 0.2.0),
     ellipsis (>= 0.3.0),
     rlang
-LazyData: TRUE
 ByteCompile: TRUE
 Suggests:
     testthat (>= 0.11.0),
@@ -52,7 +51,7 @@ Suggests:
     mockery (>= 0.4.2),
     geojsonsf,
     sf
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Collate:
     'async.R'
     'content-types.R'
@@ -93,3 +92,4 @@ Collate:
     'zzz.R'
 RdMacros: lifecycle
 Language: en-US
+Config/Needs/install: Cairo

Dockerfile

@@ -19,7 +19,7 @@ RUN install2.r remotes
 ## https://stackoverflow.com/a/55621942/591574
 #ADD https://github.com/rstudio/plumber/commits/ _docker_cache
 
-ARG PLUMBER_REF=master
+ARG PLUMBER_REF=main
 RUN Rscript -e "remotes::install_github('rstudio/plumber@${PLUMBER_REF}')"
 
 EXPOSE 8000