ci(workflows): Use routine and R CMD check reusable shiny workflows

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

@@ -4,56 +4,28 @@ on:
   push:
     branches: [main, master]
     paths:
-      - 'pkg-r/**'
-      - '.github/workflows/R-CMD-check.yaml'
+      - "pkg-r/**"
+      - ".github/workflows/R-CMD-check.yaml"
   pull_request:
     paths:
-      - 'pkg-r/**'
-      - '.github/workflows/R-CMD-check.yaml'
+      - "pkg-r/**"
+      - ".github/workflows/R-CMD-check.yaml"
 
 name: R-CMD-check.yaml
 
 permissions: read-all
 
 jobs:
+  routine:
+    uses: rstudio/shiny-workflows/.github/workflows/routine.yaml@v1
+    permissions:
+      contents: write
+    with:
+      working-directory: pkg-r
+      format-r-code: true
+      check-js: false
   R-CMD-check:
-    runs-on: ${{ matrix.config.os }}
-
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
-
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {os: macos-latest,   r: 'release'}
-          - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-
-    env:
-      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      R_KEEP_PKG_SOURCE: yes
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: r-lib/actions/setup-pandoc@v2
-
-      - uses: r-lib/actions/setup-r@v2
-        with:
-          r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent }}
-          use-public-rspm: true
-
-      - uses: r-lib/actions/setup-r-dependencies@v2
-        with:
-          extra-packages: any::rcmdcheck
-          needs: check
-          working-directory: pkg-r
-
-      - uses: r-lib/actions/check-r-package@v2
-        with:
-          working-directory: pkg-r
-          upload-snapshots: true
-          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
+    uses: rstudio/shiny-workflows/.github/workflows/R-CMD-check.yaml@v1
+    with:
+      working-directory: pkg-r
+      extra-check-build-args: '"--compact-vignettes=gs+qpdf"'

pkg-r/DESCRIPTION

@@ -35,7 +35,7 @@ Suggests:
     later,
     testthat (>= 3.0.0)
 Remotes:
-    tidyverse/ellmer#503
+    tidyverse/ellmer
 Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Encoding: UTF-8

pkg-r/R/chat_enable_bookmarking.R

@@ -119,7 +119,9 @@ chat_enable_bookmarking <- function(
   cancel_on_restore_client <-
     session$onRestore(function(state) {
       client_state <- state$values[[id]]
-      if (is.null(client_state)) return()
+      if (is.null(client_state)) {
+        return()
+      }
 
       client_set_state(client, client_state)
 
@@ -233,14 +235,18 @@ has_session_chat_bookmark_info <- function(session, id) {
   return(!is.null(get_session_chat_bookmark_info(session, id)))
 }
 get_session_chat_bookmark_info <- function(session, id) {
-  if (is.null(session)) return(NULL)
+  if (is.null(session)) {
+    return(NULL)
+  }
 
   info <- session$userData$shinychat
   key <- session$ns(id)
   return(info[[key]])
 }
 set_session_chat_bookmark_info <- function(session, id, value) {
-  if (is.null(session)) return(NULL)
+  if (is.null(session)) {
+    return(NULL)
+  }
 
   if (is.null(session$userData$shinychat)) {
     session$userData$shinychat <- list()

pkg-r/R/utils-shiny.R

@@ -8,6 +8,8 @@ check_active_session <- function(session = shiny::getDefaultReactiveDomain()) {
 }
 
 resolve_id <- function(id, session = shiny::getDefaultReactiveDomain()) {
-  if (is.null(session)) return(id)
+  if (is.null(session)) {
+    return(id)
+  }
   session$ns(id)
 }