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.

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

Enable savvy-cli to handle duplicated definitions #334

Merged
merged 23 commits into from
Jan 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 16 additions & 0 deletions .github/workflows/generate_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,22 @@ jobs:

- uses: dtolnay/rust-toolchain@nightly

- name: check wrapper file generation
run: |
cargo run --manifest-path ./savvy-cli/Cargo.toml -- update ./R-package/

# If there's any change, exit with non-zero status
# (the code is derived from https://stackoverflow.com/a/3879077)
git add ./R-package/
git update-index --refresh
if ! git diff-index --quiet HEAD -- ./R-package/; then
echo
echo "some change on wrapper file generation was detected!"
echo
git diff ./R-package/
exit 1
fi

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
<!-- next-header -->
## [Unreleased] (ReleaseDate)

### New features

* savvy CLI can handle function definitions with `#[cfg()]` switch (See [#333](https://github.com/yutannihilation/savvy/issues/333)
for more details).

## [v0.8.2] (2024-12-25)

### New features
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ exclude = ["/book", "/R-package", "README.qmd"]
rust-version = "1.65.0"

[dependencies]
savvy-ffi = { version = "0.8.2", path = "./savvy-ffi" }
savvy-macro = { version = "0.8.2", path = "./savvy-macro" }
savvy-ffi = { version = "0.8.3-rc.4", path = "./savvy-ffi" }
savvy-macro = { version = "0.8.3-rc.4", path = "./savvy-macro" }
once_cell = "1"
num-complex = { version = "0.4.5", optional = true }

Expand Down Expand Up @@ -69,7 +69,7 @@ members = ["savvy-macro", "savvy-bindgen", "savvy-cli", "savvy-ffi", "xtask"]
resolver = "2"

[workspace.package]
version = "0.8.2"
version = "0.8.3-rc.4"
edition = "2021"
authors = ["Hiroaki Yutani"]
license = "MIT"
Expand Down
Loading
Loading