Merge pull request #19 from miraisolutions/feature/16-fix-deployment-…

…update-renv-rsconnect

Fix deployment with updated renv/rsconnect

.Rbuildignore

@@ -9,6 +9,8 @@ $run_dev.*
 ^LICENSE\.md$
 ^README\.Rmd$
 ^app\.R$
+^R/_disable_autoload\.R$
 ^rsconnect$
+^\.rscignore$
 ^\.github$
 ^deploy$

.github/workflows/ci-cd-renv.yml

@@ -15,6 +15,11 @@ on:
   schedule:
     - cron:  '0 0 1 * *'
 
+# Avoid concurrent deployments from both workflows by running one at a time
+# (specific for ShinyCICD maintenance)
+concurrency:
+  group: shinyapps-${{ github.ref }}
+
 jobs:
   CI-CD:
     runs-on: ${{ matrix.config.os }}
@@ -26,7 +31,7 @@ jobs:
       # single OS and R version, aligned with the target deployment environment
       matrix:
         config:
-          - {os: ubuntu-latest, r: 'release'}
+          - {os: ubuntu-latest, r: 'renv'}
 
     env:
       # Access token for GitHub
@@ -43,18 +48,21 @@ jobs:
         uses: r-lib/actions/setup-r@v2
         with:
           r-version: ${{ matrix.config.r }}
-          # Enable RStudio Package Manager to speed up package installation
-          use-public-rspm: true
+          # No RStudio Package Manager to respect renv.lock
+          use-public-rspm: false
 
       - name: Install system dependencies
         # This is not taken care of (yet) by r-lib/actions/setup-renv
-        # Package distro used to get the distro for the used ubuntu-latest
+        # See https://github.com/r-lib/actions/issues/785
         run: |
-          Rscript -e "install.packages(c('remotes', 'distro'))"
-          while read -r cmd
-          do
-            eval sudo $cmd
-          done < <(Rscript -e 'writeLines(with(distro::distro(), remotes::system_requirements(id, short_version)))')
+          # We rely on pkgdepends from the library embedded in pak
+          install.packages("pak", repos = "https://r-lib.github.io/p/pak/stable/")
+          install.packages("jsonlite")
+          .libPaths(c(system.file("library", package = "pak"), .libPaths()))
+          pkgdepends::new_pkg_installation_proposal(
+            names(jsonlite::read_json("renv.lock")$Packages), config = list(dependencies = FALSE)
+          )$solve()$install_sysreqs()
+        shell: Rscript {0}
 
       - name: Activate renv and restore packages with cache
         uses: r-lib/actions/setup-renv@v2
@@ -68,7 +76,7 @@ jobs:
 
       - name: Deploy to shinyapps.io
         # Continuous deployment only for pushes to the main / master branch
-        if: false && (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master')
+        if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'
         env:
           SHINYAPPS_ACCOUNT: ${{ secrets.SHINYAPPS_ACCOUNT }}
           SHINYAPPS_TOKEN: ${{ secrets.SHINYAPPS_TOKEN }}

.github/workflows/ci-cd.yml

@@ -15,6 +15,11 @@ on:
   schedule:
     - cron:  '0 0 1 * *'
 
+# Avoid concurrent deployments from both workflows by running one at a time
+# (specific for ShinyCICD maintenance)
+concurrency:
+  group: shinyapps-${{ github.ref }}
+
 jobs:
   CI-CD:
     runs-on: ${{ matrix.config.os }}

.rscignore

@@ -0,0 +1 @@
+renv.lock

R/_disable_autoload.R

@@ -0,0 +1,3 @@
+# Disabling shiny autoload
+
+# See ?shiny::loadSupport for more information

R/app_server.R

@@ -8,7 +8,7 @@
 app_server <- function(input, output, session) {
   output$distPlot <- renderPlot({
     # generate bins based on input$bins from ui.R
-    x    <- faithful[, 2]
+    x    <- datasets::faithful[, 2]
     bins <- seq(min(x), max(x), length.out = input$bins + 1)
 
     # draw the histogram with the specified number of bins

ShinyCICD.Rproj

@@ -1,7 +1,7 @@
 Version: 1.0
 
-RestoreWorkspace: Default
-SaveWorkspace: Default
+RestoreWorkspace: No
+SaveWorkspace: No
 AlwaysSaveHistory: Default
 
 EnableCodeIndexing: Yes

deploy/deploy-shinyapps.R

@@ -1,8 +1,20 @@
 # deploy/deploy-shinyapps.R
 # usethis::use_build_ignore("deploy")
-rsconnect::setAccountInfo(
-  Sys.getenv("SHINYAPPS_ACCOUNT"),
-  Sys.getenv("SHINYAPPS_TOKEN"),
-  Sys.getenv("SHINYAPPS_SECRET")
+if (!interactive()) {
+  rsconnect::setAccountInfo(
+    Sys.getenv("SHINYAPPS_ACCOUNT"),
+    Sys.getenv("SHINYAPPS_TOKEN"),
+    Sys.getenv("SHINYAPPS_SECRET")
+  )
+}
+# Add here any additional files/directories the app needs
+app_files = c(
+  "app.R",
+  "DESCRIPTION",
+  "NAMESPACE",
+  "R/",
+  "inst/"
+)
+rsconnect::deployApp(
+  appName = "ShinyCICD", appFiles = app_files, forceUpdate = TRUE
 )
-rsconnect::deployApp(appName = "ShinyCICD")