Skip to content

Commit

Permalink
CI/CD: Update scripts (#377)
Browse files Browse the repository at this point in the history
* Update step

* Drop hack for R < 4.3

* Enable rspm

* Error on note
  • Loading branch information
Ilia-Kosenkov authored Aug 8, 2024
1 parent 4a3344e commit c6d35e1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
16 changes: 2 additions & 14 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"'
3 changes: 1 addition & 2 deletions .github/workflows/test_pkg_gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit c6d35e1

Please sign in to comment.