Switching workflow scripts to maxos as ubuntu run scripts are failing…

… on websocket
dfe-analytical-services · Nov 27, 2024 · 9b764d4 · 9b764d4
1 parent 866e84f
commit 9b764d4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/.github/workflows/automated-tests.yaml b/.github/workflows/automated-tests.yaml
@@ -9,8 +9,14 @@ name: Automated tests
 
 jobs:
   automatedTests:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.config.os }}
 
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macOS-latest, r: 'release'}
+
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 

diff --git a/.github/workflows/deploy-shiny.yaml b/.github/workflows/deploy-shiny.yaml
@@ -3,12 +3,19 @@ on:
     branches:
       - main
       - development
+  pull-request:
 
 name: shinyapps.io deploy
 
 jobs:
   deployShiny:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macOS-latest, r: 'release'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -54,6 +61,7 @@ jobs:
 # Get in touch with the Stats Development 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
@@ -10,13 +10,12 @@ jobs:
   tidyCode:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: tidy-code
 
     strategy:
       fail-fast: false
       matrix:
         config:
-        # Running on mac as it's quicker to build
           - {os: macOS-latest, r: 'release'}
 
     env:
@@ -57,7 +56,7 @@ jobs:
       - name: Tidy code
         shell: Rscript {0}
         run: |
-            codeChecks <- tidy_code()
+            codeChecks <- dfeshiny::tidy_code()
             
             if(any(is.na(codeChecks))) {
               stop("There is a breaking error in the code.")