From 7b4c104aaa99bf95525d30465457b58e0a4a573c Mon Sep 17 00:00:00 2001 From: cjvanlissa Date: Thu, 27 Apr 2023 11:32:47 +0200 Subject: [PATCH] update github actions --- .github/workflows/R-CMD-check.yaml | 49 ++++++++++++++++ .github/workflows/check-standard.yaml | 84 --------------------------- DESCRIPTION | 2 +- README.Rmd | 2 +- cran-comments.md | 19 ++++-- 5 files changed, 64 insertions(+), 92 deletions(-) create mode 100644 .github/workflows/R-CMD-check.yaml delete mode 100644 .github/workflows/check-standard.yaml diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml new file mode 100644 index 0000000..a3ac618 --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,49 @@ +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples +# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help +on: + push: + branches: [main, master] + pull_request: + branches: [main, master] + +name: R-CMD-check + +jobs: + R-CMD-check: + runs-on: ${{ matrix.config.os }} + + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) + + strategy: + fail-fast: false + matrix: + config: + - {os: macos-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + + steps: + - uses: actions/checkout@v3 + + - 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-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml deleted file mode 100644 index e7bad16..0000000 --- a/.github/workflows/check-standard.yaml +++ /dev/null @@ -1,84 +0,0 @@ -# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag. -# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions -on: - push: - branches: - - main - - master - pull_request: - branches: - - main - - master - -name: R-CMD-check - -jobs: - R-CMD-check: - runs-on: ${{ matrix.config.os }} - - name: ${{ matrix.config.os }} (${{ matrix.config.r }}) - - strategy: - fail-fast: false - matrix: - config: - - {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"} - - env: - R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - - steps: - - uses: actions/checkout@v2 - - - uses: r-lib/actions/setup-r@v1 - with: - r-version: ${{ matrix.config.r }} - - - 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 - 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} - - - 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/DESCRIPTION b/DESCRIPTION index 11cc289..86108b8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Authors@R: c( person(c("Xin"), "Gu", role = c("aut"), email = "guxin57@hotmail.com"), person(c("Herbert"), "Hoijtink", role = c("aut"), email = "h.hoijtink@uu.nl"), person(c("Joris"), "Mulder", role = c("aut"), email = "jomulder@gmail.com"), - person(c("Caspar", "J"), "van Lissa", role = c("aut", "cre"), email = "c.j.vanlissa@uu.nl"), + person(c("Caspar", "J"), "van Lissa", role = c("aut", "cre"), email = "c.j.vanlissa@tilburguniversity.edu"), person(c("Van Zundert"), "Camiel", role = "ctb"), person(c("Jeff"), "Jones", role = "ctb"), person(c("Niels"), "Waller", role = "ctb") diff --git a/README.Rmd b/README.Rmd index 13da625..2a81223 100644 --- a/README.Rmd +++ b/README.Rmd @@ -15,7 +15,7 @@ knitr::opts_chunk$set( [![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html#stable) [![CRAN status](https://www.r-pkg.org/badges/version/bain)](https://cran.r-project.org/package=bain) -[![R-CMD-check](https://github.com/cjvanlissa/bain/workflows/R-CMD-check/badge.svg)](https://github.com/cjvanlissa/bain/actions) +[![R-CMD-check](https://github.com/cjvanlissa/bain/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/cjvanlissa/bain/actions/workflows/R-CMD-check.yaml) [![](https://cranlogs.r-pkg.org/badges/bain)](https://cran.r-project.org/package=bain) [![test-coverage](https://github.com/cjvanlissa/bain/workflows/test-coverage/badge.svg)](https://github.com/cjvanlissa/bain/actions) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://www.contributor-covenant.org/version/2/0/code_of_conduct.html) diff --git a/cran-comments.md b/cran-comments.md index 1777518..d85d236 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,14 +1,16 @@ -# Version 0.2.8 +# Version 0.2.9 * Minor bugfix to ensure compatibility with JASP ## Test environments -* local x86_64-pc-linux-gnu, R 4.1.0 -* rhub check: Windows Server 2008 R2 SP1, R-devel, 32/64 bit -* rhub check: Ubuntu Linux 20.04.1 LTS, R-release, GCC +* local x86_64-pc-linux-gnu, R 4.2.2 +* rhub check: Windows Server 2022, R-devel, 64 bit * rhub check: Fedora Linux, R-devel, clang, gfortran +* rhub check: Ubuntu Linux 20.04.1 LTS, R-release, GCC * rhub check: Debian Linux, R-devel, GCC ASAN/UBSAN -* win-builder (devel and release) +* win-builder: 4.2.3 (2023-03-15 ucrt) +* win-builder: 4.3.0 (2023-04-21 ucrt) +* win-builder: R Under development (unstable) (2023-04-25 r84327 ucrt) * GitHub actions, windows-latest (release) * GitHub actions, macOS-latest (release) * GitHub actions, ubuntu-20.04 (release) @@ -16,4 +18,9 @@ ## R CMD check results -0 errors | 0 warnings | 0 notes +0 errors | 0 warnings | 2 notes + +* New maintainer + + My affiliation changed, https://www.tilburguniversity.edu/nl/medewerkers/c-j-vanlissa +* (possibly) invalid DOIs + + These DOIs are correct, but the server blocks some automated calls.