Update to use latest examples (again)

Also simplify the R CMD check
Public-Health-Scotland · Nov 30, 2023 · e5234f7 · e5234f7
1 parent 6a0c9f1
commit e5234f7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -11,26 +11,27 @@ name: R-CMD-check
 jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
+
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
-    continue-on-error: ${{ matrix.config.must_pass }}
 
     strategy:
       fail-fast: false
       matrix:
         config:
             # Windows
-          - {os: windows-latest, r: 'release', must_pass: true}
+          - {os: windows-latest, r: 'release'}
             # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6', must_pass: true}
+          - {os: windows-latest, r: '3.6'}
             # Linux
-          - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release', must_pass: false}
-          - {os: ubuntu-latest, r: 'release', must_pass: true}
-          - {os: ubuntu-latest, r: 'oldrel-1', must_pass: true}
-          - {os: ubuntu-latest, r: 'oldrel-2', must_pass: false}
+          - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest, r: 'release'}
+            # Mac OS
+          - {os: macos-latest,   r: 'release'}
+
             # Vesions in use on PHS PWB
-          - {os: ubuntu-latest, r: '4.0.2', must_pass: true}
-          - {os: ubuntu-latest, r: '4.1.2', must_pass: true}
-          - {os: ubuntu-latest, r: '3.6.1', must_pass: true}
+          - {os: ubuntu-latest, r: '4.0.2'}
+          - {os: ubuntu-latest, r: '4.1.2'}
+          - {os: ubuntu-latest, r: '3.6.1'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/render-README.yml b/.github/workflows/render-README.yml
@@ -6,18 +6,20 @@ on:
 jobs:
   render:
     name: Render README
-    runs-on: macOS-latest
+    runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: r-lib/actions/setup-r@v1
-      - uses: r-lib/actions/setup-pandoc@v1
+      - uses: actions/checkout@v3
+      - uses: r-lib/actions/setup-r@v2
+      - uses: r-lib/actions/setup-pandoc@v2
       - name: Install rmarkdown
         run: Rscript -e 'install.packages("rmarkdown")'
       - name: Render README
         run: Rscript -e 'rmarkdown::render("README.Rmd", output_format = "md_document")'
       - name: Commit results
         run: |
+          git config --local user.name "$GITHUB_ACTOR"
+          git config --local user.email "[email protected]"
           git commit README.md -m 'Re-build README.Rmd' || echo "No changes to commit"
           git push origin || echo "No changes to commit"
diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -65,7 +65,7 @@ jobs:
           then
             git config --local user.name "$GITHUB_ACTOR"
             git config --local user.email "[email protected]"
-            git commit ${FILES_TO_COMMIT[*]} -m "Style code"
+            git commit ${FILES_TO_COMMIT[*]} -m "Style code (GHA)"
             git pull --ff-only
             git push origin
           else

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -31,7 +31,7 @@ jobs:
           covr::codecov(
             quiet = FALSE,
             clean = FALSE,
-            install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package")
+            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
         shell: Rscript {0}