From c6d35e1606c8d2669fba35b2d9c89e6981727e32 Mon Sep 17 00:00:00 2001
From: Ilia Kosenkov <ilia.kosenkov@outlook.com>
Date: Thu, 8 Aug 2024 23:05:33 +0300
Subject: [PATCH] CI/CD: Update scripts (#377)

* Update step

* Drop hack for R < 4.3

* Enable rspm

* Error on note
---
 .github/workflows/R-CMD-check.yaml  | 16 ++--------------
 .github/workflows/test_pkg_gen.yaml |  3 +--
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
index 7ee1f228..c9310b18 100644
--- a/.github/workflows/R-CMD-check.yaml
+++ b/.github/workflows/R-CMD-check.yaml
@@ -39,7 +39,7 @@ jobs:
           toolchain: ${{ matrix.config.rust-version }}
           targets: ${{ matrix.config.rust-target }}
 
-      - uses: baptiste0928/cargo-install@v2
+      - uses: baptiste0928/cargo-install@v3
         if: matrix.config.r == 'release'
         with:
           crate: cargo-license
@@ -55,18 +55,6 @@ jobs:
           cache-version: 2
           extra-packages: rcmdcheck
 
-      # TODO: allow warnings on oldrel (cf., https://stat.ethz.ch/pipermail/r-package-devel/2023q2/009229.html)
-      - name: Check R version
-        id: error-on
-        run: |
-          output <- Sys.getenv("GITHUB_OUTPUT")
-          if (.Platform$OS.type == "windows" && getRversion() < "4.3.0") {
-            cat('level=error', file = output, append = TRUE)
-          } else {
-            cat('level=warning', file = output, append = TRUE)
-          }
-        shell: Rscript {0}
-
       - uses: r-lib/actions/check-r-package@v2
         with:
-          error-on: '"${{ steps.error-on.outputs.level }}"'
+          error-on: '"note"'
diff --git a/.github/workflows/test_pkg_gen.yaml b/.github/workflows/test_pkg_gen.yaml
index 8909bd27..1292929f 100644
--- a/.github/workflows/test_pkg_gen.yaml
+++ b/.github/workflows/test_pkg_gen.yaml
@@ -47,8 +47,7 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
           rtools-version: ${{ matrix.config.rtools-version }}
-          # TODO: enable RSPM when all the packages are available
-          use-public-rspm: false
+          use-public-rspm: true
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with: