Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI failure #21

Merged
merged 7 commits into from
Jul 6, 2023
Merged

Fix CI failure #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a80fba1
Remove tweaks for R < 4.2
yutannihilation Jul 2, 2023
9673223
Use dtolnay/rust-toolchain action
yutannihilation Jul 2, 2023
950eb73
Remove unused rtools-version
yutannihilation Jul 2, 2023
d4796be
Remove 32bit-related topic from README
yutannihilation Jul 2, 2023
ab720c8
Test on R-devel
yutannihilation Jul 2, 2023
7c46205
Add rust-target
yutannihilation Jul 2, 2023
4b14064
Remove TOOLCHAIN envvar, which might conflict
yutannihilation Jul 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,28 @@ jobs:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rtools-version: '42'}
- {os: windows-latest, r: '4.1', rust-version: 'stable-msvc'}
- {os: windows-latest, r: 'release', rust-version: 'stable-msvc', rust-target: 'x86_64-pc-windows-gnu'}
yutannihilation marked this conversation as resolved.
Show resolved Hide resolved
- {os: macOS-latest, r: 'release', rust-version: 'stable'}
- {os: ubuntu-latest, r: 'release', rust-version: 'stable'}
- {os: ubuntu-latest, r: 'devel', rust-version: 'stable'}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
TOOLCHAIN: ${{ matrix.config.rust-version }}

steps:
- uses: actions/checkout@v2

- uses: actions-rs/toolchain@v1
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.config.rust-version }}
default: true

- name: Add Rust targets for R < 4.2 on Windows
if: startsWith(runner.os, 'Windows') && matrix.config.r == '4.1'
run: |
rustup target add x86_64-pc-windows-gnu
rustup target add i686-pc-windows-gnu
targets: ${{ matrix.config.rust-target }}

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

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
use-public-rspm: true
rtools-version: ${{ matrix.config.rtools-version }}

- uses: r-lib/actions/setup-r-dependencies@v2
with:
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ This is a template package to demonstrate how to call Rust from R using the [ext

Before you can install this package, you need to install a working Rust toolchain. We recommend using [rustup.](https://rustup.rs/)

On Windows, you'll also have to add the `i686-pc-windows-gnu` and `x86_64-pc-windows-gnu` targets:
On Windows, you'll also have to add the `x86_64-pc-windows-gnu` target:
```
rustup target add x86_64-pc-windows-gnu
rustup target add i686-pc-windows-gnu
```

Once Rust is working, you can install this package via:
Expand Down