Skip to content

Commit

Permalink
Match the croaring-sys version with the version of CRoaring
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr-Emann committed Jul 2, 2024
1 parent ae86d9d commit 57ab686
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
target
.DS_Store
.idea
/README.md.tmp
README.md.tmp
Cargo.toml.tmp
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test:
croaring_release_url_base = https://github.com/RoaringBitmap/CRoaring/releases/download

# Fetch the c source amalgamation from a tagged CRoaring release (like `make version=0.9.3 update_croaring`)
update_croaring: download_croaring bindgen update_readme_croaring_version
update_croaring: download_croaring bindgen update_readme_croaring_version update_croaring_sys_version

download_croaring:
rm -f '$(croaring_source)/roaring.c' '$(croaring_source)/roaring.h' '$(croaring_source)/roaring.hh'
Expand All @@ -42,6 +42,12 @@ update_readme_croaring_version:
@sed -r -e 's_\[CRoaring version `[0-9]+\.[0-9]+\.[0-9]+`\]\([^\)]+\)_[CRoaring version `$(version)`](https://github.com/RoaringBitmap/CRoaring/releases/tag/v$(version))_' README.md > README.md.tmp
@mv README.md.tmp README.md

# We don't always want to update the version of croaring-sys dependency in croaring, but we always want to update croaring-sys
update_croaring_sys_version:
@echo "Updating croaring-sys version in Cargo.toml to $(version)"
@sed -r -e 's/^version = ".*"/version = "$(version)"/' croaring-sys/Cargo.toml > croaring-sys/Cargo.toml.tmp
@mv croaring-sys/Cargo.toml.tmp croaring-sys/Cargo.toml

# Build a c program to (re)generate the example serialized files for testing
test_serialization_files:
cd croaring/tests/data/ && \
Expand Down
2 changes: 1 addition & 1 deletion croaring-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "croaring-sys"
version = "3.0.0"
version = "4.0.0"
edition = "2021"
authors = ["croaring-rs developers"]
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion croaring/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ roaring = "0.10"
criterion = { version = "0.5", features = ["html_reports"] }

[dependencies]
ffi = { package = "croaring-sys", path = "../croaring-sys", version = "3.0.0" }
ffi = { package = "croaring-sys", path = "../croaring-sys", version = "4.0.0" }

[[bench]]
name = "benches"
Expand Down

0 comments on commit 57ab686

Please sign in to comment.