From b3d8480eaef577b83ba35249280e4a13d8aeefe8 Mon Sep 17 00:00:00 2001 From: James <1jamesthompson1@gmail.com> Date: Sun, 9 Jul 2023 18:34:00 +1200 Subject: [PATCH 1/2] Remove AddXMLInternal to fix pkgdown build --- man/AddXMLInternal.Rd | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 man/AddXMLInternal.Rd diff --git a/man/AddXMLInternal.Rd b/man/AddXMLInternal.Rd deleted file mode 100644 index 25031450..00000000 --- a/man/AddXMLInternal.Rd +++ /dev/null @@ -1,7 +0,0 @@ -\name{AddXMLInternal} -\alias{.AddXMLAddTitle} -\title{Internal functions for adding the necessary XML content for accessible graphs in SVG format} -\description{Mostly internal functions for adding XML content to an external file} -\details{Not for use as exported functions} -\value{Either the filename written to, or NULL} -\author{Volker Sorge and A. Jonathan R. Godfrey} From f6d69913b7413df67108ed75a9e5d49d39e50c85 Mon Sep 17 00:00:00 2001 From: James <1jamesthompson1@gmail.com> Date: Sun, 9 Jul 2023 18:54:45 +1200 Subject: [PATCH 2/2] Update RMD check build to use a v2 worflow --- .github/workflows/R-CMD-check.yaml | 71 ++++++++---------------------- 1 file changed, 18 insertions(+), 53 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index e7bad16f..eefd9cb4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -2,13 +2,9 @@ # https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions on: push: - branches: - - main - - master + branches: [main, master] pull_request: - branches: - - main - - master + branches: [main, master] name: R-CMD-check @@ -22,63 +18,32 @@ jobs: fail-fast: false matrix: config: + - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - - {os: macOS-latest, r: 'release'} - - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true - - uses: r-lib/actions/setup-pandoc@v1 - - - name: Query dependencies - run: | - install.packages('remotes') - saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) - writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") - shell: Rscript {0} - - - name: Cache R packages - if: runner.os != 'Windows' - uses: actions/cache@v2 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - path: ${{ env.R_LIBS_USER }} - key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} - restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- - - - name: Install system dependencies - if: runner.os == 'Linux' - run: | - while read -r cmd - do - eval sudo $cmd - done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))') - - - name: Install dependencies - run: | - remotes::install_deps(dependencies = TRUE) - remotes::install_cran("rcmdcheck") - shell: Rscript {0} - - - name: Check - env: - _R_CHECK_CRAN_INCOMING_REMOTE_: false - run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check") - shell: Rscript {0} + extra-packages: any::rcmdcheck + needs: check - - name: Upload check results - if: failure() - uses: actions/upload-artifact@main + - uses: r-lib/actions/check-r-package@v2 with: - name: ${{ runner.os }}-r${{ matrix.config.r }}-results - path: check + upload-snapshots: true \ No newline at end of file