Merge branch 'development' of github.com:PredictiveEcology/SpaDES.pro…

…ject into development
PredictiveEcology · Feb 7, 2025 · 5201b00 · 5201b00
2 parents b9fc364 + a812dd0
commit 5201b00
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -28,13 +28,13 @@ jobs:
           - {os: macOS-latest,   nosuggests: false, r: 'release'}
           - {os: windows-latest, nosuggests: false, r: 'devel'}
           - {os: windows-latest, nosuggests: false, r: 'release'}
-          - {os: windows-latest, nosuggests: false, r: 'oldrel/1'}
-          - {os: windows-latest, nosuggests: false, r: 'oldrel/2'}
+          - {os: windows-latest, nosuggests: false, r: 'oldrel-1'}
+          - {os: windows-latest, nosuggests: false, r: 'oldrel-2'}
           - {os: ubuntu-latest,   nosuggests: false, r: 'devel'}
           - {os: ubuntu-latest,   nosuggests: false, r: 'release'}
           - {os: ubuntu-latest,   nosuggests: true,  r: 'release'}
-          - {os: ubuntu-latest,   nosuggests: false, r: 'oldrel/1'}
-          - {os: ubuntu-latest,   nosuggests: false, r: 'oldrel/2'}
+          - {os: ubuntu-latest,   nosuggests: false, r: 'oldrel-1'}
+          - {os: ubuntu-latest,   nosuggests: false, r: 'oldrel-2'}
 
     env:
       _R_CHECK_DEPENDS_ONLY_: ${{ matrix.config.nosuggests }}
@@ -46,10 +46,11 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: PredictiveEcology/actions/install-spatial-deps@v0.1
+      - uses: PredictiveEcology/actions/install-spatial-deps@v0.2
 
       - uses: r-lib/actions/setup-r@v2
         with:
+          extra-repositories: 'https://PredictiveEcology.r-universe.dev/'
           Ncpus: 2
           r-version: ${{ matrix.config.r }}
           use-public-rspm: false

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -24,11 +24,13 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: PredictiveEcology/actions/install-spatial-deps@v0.1
+      - uses: PredictiveEcology/actions/install-spatial-deps@v0.2
 
       - uses: r-lib/actions/setup-r@v2
         with:
+          extra-repositories: 'https://PredictiveEcology.r-universe.dev/'
           Ncpus: 2
+          r-version: ${{ matrix.config.r }}
           use-public-rspm: false
 
       - uses: r-lib/actions/setup-r-dependencies@v2

diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml
@@ -22,11 +22,13 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
 
-      - uses: PredictiveEcology/actions/install-spatial-deps@v0.1
+      - uses: PredictiveEcology/actions/install-spatial-deps@v0.2
 
       - uses: r-lib/actions/setup-r@v2
         with:
+          extra-repositories: 'https://PredictiveEcology.r-universe.dev/'
           Ncpus: 2
+          r-version: ${{ matrix.config.r }}
           use-public-rspm: false
 
       - uses: r-lib/actions/setup-r-dependencies@v2