Skip to content

Commit 8b10944

Browse files
committed
fix ci on windows
1 parent 83eedf6 commit 8b10944

1 file changed

Lines changed: 6 additions & 12 deletions

File tree

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
config:
21-
- {os: windows-latest, r: 'release', rust-version: 'stable-msvc'}
22-
- {os: windows-latest, r: 'devel', rust-version: 'stable-msvc'}
21+
- {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu'}
22+
- {os: windows-latest, r: 'devel', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu'}
2323
- {os: macOS-latest, r: 'release', rust-version: 'stable'}
2424
- {os: ubuntu-latest, r: 'release', rust-version: '1.81.0'}
25-
- {os: ubuntu-latest, r: 'devel', rust-version: 'stable'}
25+
- {os: ubuntu-latest, r: 'devel', rust-version: 'stable'}
2626

2727
env:
2828
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -31,17 +31,11 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@v2
3333

34-
- uses: actions-rs/toolchain@v1
34+
- uses: dtolnay/rust-toolchain@master
3535
with:
3636
toolchain: ${{ matrix.config.rust-version }}
37-
default: true
38-
39-
- name: Add Rust targets for R < 4.2 on Windows
40-
if: startsWith(runner.os, 'Windows') && matrix.config.r == '4.1'
41-
run: |
42-
rustup target add x86_64-pc-windows-gnu
43-
rustup target add i686-pc-windows-gnu
44-
37+
targets: ${{ matrix.config.rust-target }}
38+
4539
- uses: r-lib/actions/setup-pandoc@v2
4640

4741
- uses: r-lib/actions/setup-r@v2

0 commit comments

Comments
 (0)