Merge branch 'master' into sept-update-23

Public-Health-Scotland · Sep 28, 2023 · b11c89e · b11c89e
2 parents 9635e0c + 6e866cd
commit b11c89e
Show file tree

Hide file tree

Showing 9 changed files with 152 additions and 38 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -5,6 +5,7 @@ ADPE
 adtf
 arrivalmode
 arth
+atlassian
 attendcat
 aut
 bedday
@@ -16,8 +17,10 @@ callr
 Canx
 carehome
 careinspectorate
+categorises
 cattend
 CCYY
+cdn
 cennum
 chp
 chpstart
@@ -27,6 +30,7 @@ cls
 cmh
 CNWs
 Comhairle
+codecov
 commhosp
 congen
 costincdnas
@@ -35,6 +39,7 @@ costsfy
 covr
 cph
 createslf
+customise
 dataframe
 datamart
 datazone
@@ -47,7 +52,9 @@ dbconnect
 dbplyr
 deathdiag
 demog
+devhints
 dfc
+Diagramme
 disch
 dischloc
 dischto
@@ -94,9 +101,11 @@ homev
 hscdiip
 hscp
 hscpnames
+htmlwidgets
 IDPC
 infyyear
 ipdc
+issuenumber
 itle
 iwalk
 jaccard
@@ -110,12 +119,14 @@ keytimex
 kis
 lazydt
 lgl
+lintr
 los
 ltc
 ltcs
 lubridate
 magrittr
 Matern
+markdownguide
 Mcbride
 mcmahon
 MMMYY
@@ -145,6 +156,7 @@ PCEC
 phs
 phsmethods
 phsopendata
+pkgdown
 placeinc
 plics
 PMS
@@ -156,6 +168,7 @@ praccode
 ptypes
 purrr
 quickstart
+rankdir
 Rbuildignore
 rcmdcheck
 rdd
@@ -167,6 +180,7 @@ readr
 readxl
 reasonwait
 recid
+reflectoring
 refsource
 renviron
 rlang
@@ -176,6 +190,7 @@ Rprofile
 Rscript
 rspm
 RStudio
+rstudio
 rstudioapi
 Rtype
 SDcols
@@ -187,6 +202,7 @@ setnames
 Siar
 sigfac
 simd
+SLF
 slf
 slfhelper
 smr

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -24,7 +24,7 @@ jobs:
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

diff --git a/.github/workflows/clean_cache.yaml b/.github/workflows/clean_cache.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Cleanup
         run: |

diff --git a/.github/workflows/document.yaml b/.github/workflows/document.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/lint-changed-files.yaml b/.github/workflows/lint-changed-files.yaml
@@ -12,7 +12,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
 

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Checkout Pull Request
         if: contains(env.isPR, 'true')

diff --git a/.github/workflows/style.yaml b/.github/workflows/style.yaml
@@ -15,7 +15,7 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup R
         uses: r-lib/actions/setup-r@v2

diff --git a/R_development_SOP.md b/R_development_SOP.md