Merge pull request #10 from dfe-analytical-services/development

Update deploy script

.Rprofile

@@ -13,7 +13,7 @@ cat("Sourcing .Rprofile.", fill = TRUE)
 
 source("renv/activate.R")
 
-# Tidy code function
+# Tidy code functiona
 tidy_code <- function() {
   source("global.r")
   tidy_code_function()

.github/workflows/deploy-shiny.yaml

@@ -2,6 +2,7 @@ on:
   push:
     branches:
       - main
+      - development
 
 name: deploy-shiny
 
@@ -31,6 +32,15 @@ jobs:
           r-version: 4.2.1
           use-public-rspm: true
 
+      - name: Set env vars (dev)
+        if: endsWith(github.ref, '/development')
+        run: |
+          echo "SHINYAPP_NAME='dev-KS4-ready-reckoners'" >> $GITHUB_ENV
+      - name: Set env vars (prod)
+        if: endsWith(github.ref, '/main')
+        run: |
+          echo "SHINYAPP_NAME='KS4-transition-matrices'">> $GITHUB_ENV
+
       - name: Cache R packages
         if: runner.os != 'Windows'
         uses: actions/cache@v1
@@ -56,7 +66,8 @@ jobs:
       - name: Install rsconnect
         shell: Rscript {0}
         run: |
-          install.packages("rsconnect")
+          if (!requireNamespace("renv", quietly = TRUE)) install.packages("renv")
+          renv::install("[email protected]")
          
 # Tokens are stored as secrets in GitHub to make sure only DfE analysts can publish apps in our shiny.io area
 # Navigate to Settings > Secrets to add and view secrets. These can also be things like admin login and passwords for SQL databases.
@@ -66,5 +77,5 @@ jobs:
         run: >
           Rscript
           -e "rsconnect::setAccountInfo(name = 'department-for-education', token = '${{secrets.SHINYAPPS_TOKEN}}', secret = '${{secrets.SHINYAPPS_SECRET}}')"
-          -e "rsconnect::deployApp(appName='KS4-transition-matrices')"
-#          -e "rsconnect::deployApp(appName='KS4-transition-matrices-overflow')"
+          -e "rsconnect::deployApp(appName=${{env.SHINYAPP_NAME}})"
+