From 9038825df6a988e7019dc5c179b5bf4f1cd3907a Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:42:22 -0400 Subject: [PATCH 1/6] ignore other folder --- .Rbuildignore | 1 + .gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/.Rbuildignore b/.Rbuildignore index b6e34f1..e233823 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -8,3 +8,4 @@ ^\.Rproj.user$ ^docs$ ^pkgdown$ +^\.github$ diff --git a/.gitignore b/.gitignore index d26f767..2edf6a9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ # exclude folders data-raw/temp inst/doc +other # docs folder, generated by local pkgdown build docs From f88f7c192352428fef7add6e45c65354ceaa717f Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:42:58 -0400 Subject: [PATCH 2/6] add new badge in readme for R-CMD-check.yml --- .github/.gitignore | 1 + .github/workflows/R-CMD-check.yaml | 49 ++++++++++++++++++++++++++++++ README.md | 2 +- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 .github/.gitignore create mode 100644 .github/workflows/R-CMD-check.yaml diff --git a/.github/.gitignore b/.github/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.github/.gitignore @@ -0,0 +1 @@ +*.html 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/README.md b/README.md index 9ba2994..44cc501 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # NEFSCspatial -[![gitleaks](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/secretScan.yml/badge.svg)](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/secretScan.yml) [![gh-pages](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/pkgdown.yml/badge.svg)](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/pkgdown.yml) +[![gitleaks](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/secretScan.yml/badge.svg)](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/secretScan.yml) [![gh-pages](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/pkgdown.yml/badge.svg)](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/pkgdown.yml) [![R-CMD-check](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/NEFSC/NEFSC-Spatial/actions/workflows/R-CMD-check.yaml) A repository of spatial data (vectors and rasters) in simple features [`sf`](https://r-spatial.github.io/sf/) or [`raster`](https://github.com/rspatial/raster) format. From 01db2b692e55cefeb782a307d98fe92373d38889 Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:43:14 -0400 Subject: [PATCH 3/6] update R depends to 3.5.0 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c16de6a..c944f1f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -10,7 +10,7 @@ Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 Depends: - R (>= 2.10) + R (>= 3.5.0) Imports: sf, raster From b3cefecfff864ccd5be4232857be7acb80c6a6eb Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Tue, 6 Jun 2023 16:49:30 -0400 Subject: [PATCH 4/6] making teammembers vignette a rcognized vignette --- vignettes/teamMembers.Rmd | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vignettes/teamMembers.Rmd b/vignettes/teamMembers.Rmd index 34d74ee..1b09578 100644 --- a/vignettes/teamMembers.Rmd +++ b/vignettes/teamMembers.Rmd @@ -1,6 +1,10 @@ --- title: "Team Members" -output: html_document +output: rmarkdown::html_vignette +vignette: > + %\VignetteIndexEntry{Team Members} + %\VignetteEngine{knitr::rmarkdown} + %\VignetteEncoding{UTF-8} --- ```{r setup, include=FALSE} From a5ddb3b4c78972213a24ff31ec8b35c660f1cb60 Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Tue, 6 Jun 2023 17:06:59 -0400 Subject: [PATCH 5/6] only fail RCMD workflow on errors, not warnings --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a3ac618..7507db1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -47,3 +47,4 @@ jobs: - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true + error-on: 'error' From 3f8962a6aad6bd4987700f491ab591060372a4c8 Mon Sep 17 00:00:00 2001 From: andybeet <22455149+andybeet@users.noreply.github.com> Date: Wed, 7 Jun 2023 07:33:26 -0400 Subject: [PATCH 6/6] try this to supress errors --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 7507db1..f9c1ffc 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -47,4 +47,4 @@ jobs: - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true - error-on: 'error' + error-on: '"error"'