From 38a7a04cbffb74f98df5c12a1eaef0b6cecb6522 Mon Sep 17 00:00:00 2001 From: Alex Chubaty Date: Tue, 16 Apr 2024 15:49:59 -0600 Subject: [PATCH 1/2] Revert "tweaking GHA for NLMR installation" This reverts commit 3a8a03a84c77654ee9d00eb0dc609e779229f0a5. --- .github/workflows/pkgdown.yaml | 10 ++++++++-- .github/workflows/update-citation-cff.yaml | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 002acd98..9854df29 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -36,13 +36,19 @@ jobs: extra-packages: | any::pkgdown local::. - s-u/fastshp - ropensci/NLMR + fastshp=?ignore + NLMR=?ignore PredictiveEcology/Require@development PredictiveEcology/reproducible@development PredictiveEcology/SpaDES.tools@development needs: website + - name: Install additional package dependencies + run: | + pak::pkg_install("ropensci/NLMR") + pak::pkg_install("s-u/fastshp") + shell: Rscript {0} + - name: Build site run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) shell: Rscript {0} diff --git a/.github/workflows/update-citation-cff.yaml b/.github/workflows/update-citation-cff.yaml index 337dd559..0c43b604 100644 --- a/.github/workflows/update-citation-cff.yaml +++ b/.github/workflows/update-citation-cff.yaml @@ -34,8 +34,6 @@ jobs: extra-packages: | any::cffr any::V8 - s-u/fastshp - ropensci/NLMR - name: Update CITATION.cff run: | From e57bb6492a486b888143fe4fccfce913795e1718 Mon Sep 17 00:00:00 2001 From: Alex Chubaty Date: Tue, 16 Apr 2024 15:51:38 -0600 Subject: [PATCH 2/2] GHA: follow NLMR approach used for R CMD Check --- .github/workflows/pkgdown.yaml | 3 --- .github/workflows/update-citation-cff.yaml | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 9854df29..5d13397e 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -38,9 +38,6 @@ jobs: local::. fastshp=?ignore NLMR=?ignore - PredictiveEcology/Require@development - PredictiveEcology/reproducible@development - PredictiveEcology/SpaDES.tools@development needs: website - name: Install additional package dependencies diff --git a/.github/workflows/update-citation-cff.yaml b/.github/workflows/update-citation-cff.yaml index 0c43b604..84fa1891 100644 --- a/.github/workflows/update-citation-cff.yaml +++ b/.github/workflows/update-citation-cff.yaml @@ -34,6 +34,14 @@ jobs: extra-packages: | any::cffr any::V8 + fastshp=?ignore + NLMR=?ignore + + - name: Install additional package dependencies + run: | + pak::pkg_install("ropensci/NLMR") + pak::pkg_install("s-u/fastshp") + shell: Rscript {0} - name: Update CITATION.cff run: |