Skip to content

Commit

Permalink
Enable savvy-cli to handle duplicated definitions (#334)
Browse files Browse the repository at this point in the history
  • Loading branch information
yutannihilation authored Jan 11, 2025
1 parent a4ed47b commit aa1290e
Show file tree
Hide file tree
Showing 14 changed files with 992 additions and 760 deletions.
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

0 comments on commit aa1290e

Please sign in to comment.