Development

.github/workflows/deploy-shiny.yaml

@@ -25,11 +25,10 @@ jobs:
       RENV_PATHS_ROOT: ~/.local/share/renv
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          r-version: 4.2.1
           use-public-rspm: true
 
       - name: Set env vars (dev)

.github/workflows/shiny-tests.yaml

@@ -10,7 +10,7 @@ jobs:
   automatedTests:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: shiny-tests
 
     strategy:
       fail-fast: false
@@ -25,11 +25,10 @@ jobs:
       RENV_PATHS_ROOT: ~/.local/share/renv
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          r-version: 4.2.1
           use-public-rspm: true
 
       - name: Cache R packages
@@ -77,4 +76,4 @@ jobs:
         uses: actions/upload-artifact@master
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-tests
-          path: tests
+          path: tests

.github/workflows/tidyCode.yaml

@@ -10,7 +10,7 @@ jobs:
   tidyCode:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: tidy-code
 
     strategy:
       fail-fast: false
@@ -25,11 +25,10 @@ jobs:
       RENV_PATHS_ROOT: ~/.local/share/renv
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
-          r-version: 4.2.1
           use-public-rspm: true
 
       - name: Cache R packages
@@ -78,4 +77,4 @@ jobs:
         uses: actions/upload-artifact@master
         with:
           name: ${{ runner.os }}-r${{ matrix.config.r }}-tests
-          path: tests
+          path: tests

.hooks/pre-commit.R

@@ -3,7 +3,7 @@ cat("Running commit hooks...",fill=TRUE)
 shhh <- suppressPackageStartupMessages # It's a library, so shhh!
 shhh(library(dplyr))
 shhh(library(xfun))
-
+shhh(library(dfeshiny))
 
 error_flag <- FALSE
 
@@ -28,8 +28,6 @@ if(ncol(ign_files)>1){
   }
 }
 
-
-
 suffixes <- "xlsx$|dat$|csv$|tex$|pdf$"
 
 current_files <- data.frame(files = list.files("./", recursive = TRUE)) %>%
@@ -69,4 +67,16 @@ if (error_flag) {
   quit(save = "no", status = 1, runLast = FALSE)
 }
 
+tidy_output <- tidy_code()
+if(any(tidy_output)){
+  error_flag <- TRUE
+}
+
+if (error_flag) {
+  cat("Warning: Code did not appear to have been tidied.\nI've run tidy code for you,
+      please check your files and the dashboard still works and then re-stage and try committing again.")
+  quit(save = "no", status = 1, runLast = FALSE)
+}
+
+
 # End of hooks

global.R

@@ -11,7 +11,8 @@ shhh(library(shiny))
 shhh(library(shinyjs))
 shhh(library(tools))
 shhh(library(testthat))
-shhh(library(shinytest))
+shhh(library(shinytest2))
+shhh(library(diffviewer))
 shhh(library(shinyWidgets))
 shhh(library(shinyGovstyle))
 shhh(library(janitor))