diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 14acb8c..7597c58 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -18,7 +18,7 @@ jobs: RENV_PATHS_ROOT: ~/.local/share/renv steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -30,21 +30,12 @@ jobs: with: extra-packages: rcmdcheck - - uses: oleksiyrudenko/gha-git-credentials@v2-latest - with: - global: true - token: '${{ secrets.GITHUB_TOKEN }}' - - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' - name: Show testthat output if: always() run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true shell: bash - - - name: Upload check results - if: failure() - uses: actions/upload-artifact@main - with: - name: ${{ runner.os }}-r${{ matrix.config.r }}-results - path: check diff --git a/.github/workflows/gitleaks.yaml b/.github/workflows/gitleaks.yaml index c6b58e8..313ac7c 100644 --- a/.github/workflows/gitleaks.yaml +++ b/.github/workflows/gitleaks.yaml @@ -1,29 +1,16 @@ name: gitleaks-action - on: [pull_request, push, workflow_dispatch] jobs: - scan: - name: gitleaks-action - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v3 - + - uses: actions/checkout@v4 with: - fetch-depth: 0 - - run: wget -O .gitleaks.toml https://raw.githubusercontent.com/nhsbsa-data-analytics/nhsbsaShinyR/main/gitleaks.toml - - uses: gitleaks/gitleaks-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE}} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index d5c81a8..3f8bb90 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -13,7 +13,7 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: diff --git a/tests/testthat/test-utils_review.R b/tests/testthat/test-utils_review.R index 8382f1b..0ef6cf6 100644 --- a/tests/testthat/test-utils_review.R +++ b/tests/testthat/test-utils_review.R @@ -21,7 +21,7 @@ test_that("md_to_word generates expected Word doc", { # Due to how officer::read_docx works, we expect there to always be # differences in the package_dir and doc_properties$data. - # Also, when run on github CI, there are small differences in the Word doc + # Also, when run on github CI, there are small differences in the Word doc # generated, due to the Windows OS being Windows Server. expected_differences <- ifelse(testthat:::on_ci(), 48, 2)