Skip to content

Commit 593dbda

Browse files
authored
Merge pull request #11 from oxfordcontrol/v0.9.0-savvy
Update Github Action workflow
2 parents 12855c8 + 167d6c8 commit 593dbda

File tree

1 file changed

+11
-33
lines changed

1 file changed

+11
-33
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,41 @@ jobs:
1010
R-CMD-check:
1111
runs-on: ${{ matrix.config.os }}
1212

13-
name: ${{ matrix.config.os }} (${{ matrix.config.r }} - ${{ matrix.config.rust-version }})
13+
name: "${{ matrix.config.os }} (R: ${{ matrix.config.r }}, Rust: ${{ matrix.config.rust }})"
1414

1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
config:
19-
- {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu' }
20-
- {os: windows-latest, r: 'devel', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu' }
21-
- {os: windows-latest, r: 'oldrel', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu', rtools-version: '42' }
22-
23-
- {os: macOS-latest, r: 'release', rust-version: 'stable' }
24-
25-
- {os: ubuntu-latest, r: 'release', rust-version: 'stable' }
26-
- {os: ubuntu-latest, r: 'devel', rust-version: 'stable' }
27-
- {os: ubuntu-latest, r: 'oldrel', rust-version: 'stable' }
19+
- {os: windows-latest, r: 'release', rust: 'stable-msvc' }
20+
- {os: windows-latest, r: 'devel', rust: 'stable-msvc' }
21+
- {os: macOS-latest, r: 'release', rust: 'stable' }
22+
- {os: ubuntu-latest, r: 'release', rust: 'stable' }
23+
- {os: ubuntu-latest, r: 'devel', rust: 'stable' }
2824

2925
env:
3026
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3127
R_KEEP_PKG_SOURCE: yes
3228

3329
steps:
34-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3531

3632
- uses: r-lib/actions/setup-pandoc@v2
3733

3834
- uses: dtolnay/rust-toolchain@master
3935
with:
40-
toolchain: ${{ matrix.config.rust-version }}
41-
targets: ${{ matrix.config.rust-target }}
42-
43-
- uses: baptiste0928/cargo-install@v2
44-
if: matrix.config.r == 'release'
45-
with:
46-
crate: cargo-license
36+
toolchain: ${{ matrix.config.rust }}
4737

4838
- uses: r-lib/actions/setup-r@v2
4939
with:
5040
r-version: ${{ matrix.config.r }}
5141
rtools-version: ${{ matrix.config.rtools-version }}
42+
use-public-rspm: true
5243

5344
- uses: r-lib/actions/setup-r-dependencies@v2
5445
with:
5546
cache-version: 2
56-
extra-packages: rcmdcheck
57-
58-
# TODO: allow warnings on oldrel (cf., https://stat.ethz.ch/pipermail/r-package-devel/2023q2/009229.html)
59-
- name: Check R version
60-
id: error-on
61-
run: |
62-
output <- Sys.getenv("GITHUB_OUTPUT")
63-
if (.Platform$OS.type == "windows" && getRversion() < "4.3.0") {
64-
cat('level=error', file = output, append = TRUE)
65-
} else {
66-
cat('level=warning', file = output, append = TRUE)
67-
}
68-
shell: Rscript {0}
47+
extra-packages: any::rcmdcheck
48+
needs: check
6949

7050
- uses: r-lib/actions/check-r-package@v2
71-
with:
72-
error-on: '"${{ steps.error-on.outputs.level }}"'

0 commit comments

Comments
 (0)