Skip to content

Commit ed88a5f

Browse files
committed
Match the croaring-sys version with the version of CRoaring
1 parent 5c3aed9 commit ed88a5f

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
target
22
.DS_Store
33
.idea
4-
/README.md.tmp
4+
README.md.tmp
5+
Cargo.toml.tmp

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test:
1515
croaring_release_url_base = https://github.com/RoaringBitmap/CRoaring/releases/download
1616

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

2020
download_croaring:
2121
rm -f '$(croaring_source)/roaring.c' '$(croaring_source)/roaring.h' '$(croaring_source)/roaring.hh'
@@ -42,6 +42,12 @@ update_readme_croaring_version:
4242
@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
4343
@mv README.md.tmp README.md
4444

45+
# We don't always want to update the version of croaring-sys dependency in croaring, but we always want to update croaring-sys
46+
update_croaring_sys_version:
47+
@echo "Updating croaring-sys version in Cargo.toml to $(version)"
48+
@sed -r -e 's/^version = ".*"/version = "$(version)"/' croaring-sys/Cargo.toml > croaring-sys/Cargo.toml.tmp
49+
@mv croaring-sys/Cargo.toml.tmp croaring-sys/Cargo.toml
50+
4551
# Build a c program to (re)generate the example serialized files for testing
4652
test_serialization_files:
4753
cd croaring/tests/data/ && \

croaring-sys/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "croaring-sys"
3-
version = "3.0.0"
3+
version = "4.0.0"
44
edition = "2021"
55
authors = ["croaring-rs developers"]
66
license = "Apache-2.0"

croaring/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ roaring = "0.10"
2525
criterion = { version = "0.5", features = ["html_reports"] }
2626

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

3030
[[bench]]
3131
name = "benches"

0 commit comments

Comments
 (0)