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

julea: use upstream JULEA #55

Merged
merged 3 commits into from
Apr 3, 2024
Merged

julea: use upstream JULEA #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b906d2
julea: use upstream JULEA
michaelkuhn Mar 1, 2024
58be231
julea: bump bindgen to `v0.69`
Mar 7, 2024
fe78482
julea-betree: bump msrv to 1.70
Apr 3, 2024
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,7 @@ jobs:
run: |
sudo apt update || true
sudo apt --yes --no-install-recommends install pkgconf libglib2.0-dev libbson-dev
# FIXME use forked version
git clone --depth 1 --branch modules-conditional-unload https://github.com/tilpner/julea.git "${HOME}/julea"
git clone --depth 1 https://github.com/parcio/julea.git "${HOME}/julea"
- name: Install MSRV
run: |
cargo install cargo-msrv
Expand Down
2 changes: 1 addition & 1 deletion julea-betree/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "julea-betree"
version = "0.1.0"
authors = ["tilpner <[email protected]>"]
edition = "2018"
rust-version = "1.66.1"
rust-version = "1.70"

[lib]
name = "object_betree"
Expand Down
5 changes: 2 additions & 3 deletions julea-betree/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,9 +381,8 @@ unsafe extern "C" fn backend_iterate(

static mut BETREE_BACKEND: JBackend = JBackend {
type_: JBackendType::J_BACKEND_TYPE_OBJECT,
component: JBackendComponent::J_BACKEND_COMPONENT_SERVER
| JBackendComponent::J_BACKEND_COMPONENT_CLIENT
| JBackendComponent::J_BACKEND_COMPONENT_NOT_UNLOADABLE,
component: JBackendComponent::J_BACKEND_COMPONENT_SERVER,
flags: JBackendFlags::J_BACKEND_FLAGS_DO_NOT_UNLOAD,
data: ptr::null_mut(),
anon1: JBackend__bindgen_ty_1 {
object: JBackend__bindgen_ty_1__bindgen_ty_1 {
Expand Down
2 changes: 1 addition & 1 deletion julea-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ authors = ["tilpner <[email protected]>"]
edition = "2018"

[build-dependencies]
bindgen = "0.58"
bindgen = "0.69"
Loading