dfeshiny 0.5.3 update (#103)

* Updating package versions and deploy script * Updated workflows * Updates in line with dfeshiny 0.5.1 * Cleaned up additional conflicts * Package update * Setting R to 4.4.2 and dfeshiny to 0.5.2 * Added dfeshiny a11y_panel and header functions * Removed old accessibility statement * Update ui.R Co-authored-by: Cam Race <[email protected]> * Revert "Update ui.R" This reverts commit 32725aa. * Updating dfeshiny to latest version --------- Co-authored-by: Cam Race <[email protected]>
dfe-analytical-services · Jan 2, 2025 · 61f2769 · 61f2769
1 parent 0cb6571
commit 61f2769
Show file tree

Hide file tree

Showing 9 changed files with 319 additions and 370 deletions.
diff --git a/.github/workflows/automated-tests.yaml b/.github/workflows/automated-tests.yaml
@@ -24,6 +24,15 @@ jobs:
       - name: Install git2r dependencies
         run: sudo apt-get install -y libgit2-dev
 
+      - name: Install proj library (terra depdencies)
+        run: sudo apt-get install libproj-dev
+
+      - name: Install gdal library (terra dependencies)
+        run: sudo apt-get install libgdal-dev
+
+      - name: Install udunits library (units dependencies)
+        run: sudo apt-get install libudunits2-dev
+
       - name: Cache renv packages
         id: cache-renv
         uses: actions/cache@v4

diff --git a/.github/workflows/deploy-shiny.yaml b/.github/workflows/deploy-shiny.yaml
@@ -3,13 +3,17 @@ on:
     branches:
       - main
       - development
+  pull_request:
+    branches:
+      - main
+      - development
 
 name: shinyapps.io deploy
 
 jobs:
   deployShiny:
     runs-on: ubuntu-latest
-    
+
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
@@ -18,6 +22,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r@v2
         with:
+          r-version: 4.4.1
           use-public-rspm: true
 
       - name: Set env vars (dev)
@@ -30,7 +35,7 @@ jobs:
         run: |
           echo "SHINYAPP_NAME='dfe-shiny-template'">> $GITHUB_ENV
           echo "SHINYAPP_OVERFLOW_NAME='dfe-shiny-template-overflow'">> $GITHUB_ENV
-        
+
       - name: Restore renv snapshot
         shell: Rscript {0}
         run: |
@@ -48,6 +53,7 @@ jobs:
 # Get in touch with the Explore education statistics platforms team if you need to add the below secrets to publish to shinyapps.io
 
       - name: Push to shiny.io
+        if: github.event_name != 'pull_request'
         run: >
           Rscript
           -e "rsconnect::setAccountInfo(name = 'department-for-education', token = '${{secrets.SHINYAPPS_TOKEN}}', secret = '${{secrets.SHINYAPPS_SECRET}}')"

diff --git a/.github/workflows/tidyCode.yaml b/.github/workflows/tidyCode.yaml
@@ -0,0 +1,64 @@
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+name: tidyCode
+
+jobs:
+  tidyCode:
+    runs-on: ubuntu-latest
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: 4.4.1
+          use-public-rspm: true
+
+      - name: Install git2r dependencies
+        run: sudo apt-get install -y libgit2-dev
+
+      - name: Install proj library (terra depdencies)
+        run: sudo apt-get install libproj-dev
+
+      - name: Install gdal library (terra dependencies)
+        run: sudo apt-get install libgdal-dev
+
+      - name: Install udunits library (units dependencies)
+        run: sudo apt-get install libudunits2-dev
+
+      - name: Restore renv snapshot
+        shell: Rscript {0}
+        run: |
+          if (!requireNamespace("renv", quietly = TRUE)) install.packages("renv")
+          renv::restore()
+      
+      - name: Tidy code
+        shell: Rscript {0}
+        run: |
+            codeChecks <- dfeshiny::tidy_code()
+            
+            if(any(is.na(codeChecks))) {
+              stop("There is a breaking error in the code.")
+            } else {
+              if(TRUE %in% codeChecks) {
+                stop("The code is not styled correctly. Open the project in RStudio and use tidy_code() to restyle the code.")
+              } else {
+                message("----------------------------------------")
+                message("The code is beautiful, go you!")
+                message("----------------------------------------")
+              }
+            }
+
+      - name: Upload test results
+        if: failure()
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ runner.os }}-r${{ matrix.config.r }}-tests
+          path: tests
diff --git a/R/ui_panels/accessibility_statement.R b/R/ui_panels/accessibility_statement.R