diff --git a/rust-bindings/rust/Dockerfile b/rust-bindings/rust/Dockerfile index 3b0b295e..d09822ba 100644 --- a/rust-bindings/rust/Dockerfile +++ b/rust-bindings/rust/Dockerfile @@ -1,5 +1,4 @@ -ARG FEDORA_VER -FROM fedora:${FEDORA_VER} +FROM fedora:latest RUN dnf install -y curl gcc make tar xz 'dnf-command(builddep)' RUN dnf builddep -y ostree diff --git a/rust-bindings/rust/Makefile b/rust-bindings/rust/Makefile index 1b4f67f9..a5b5b695 100644 --- a/rust-bindings/rust/Makefile +++ b/rust-bindings/rust/Makefile @@ -1,6 +1,7 @@ GIR_REPO := https://github.com/gtk-rs/gir.git GIR_VERSION := 2d1ffab19eb5f9a2f0d7a294dbf07517dab4d989 RUSTDOC_STRIPPER_VERSION := 0.1.13 +OSTREE_VER := 2020.4 all: gir @@ -48,8 +49,7 @@ gir-files: gir-files/OSTree-1.0.gir: podman build \ - --build-arg FEDORA_VER=32 \ - --build-arg OSTREE_VER=2020.4 \ + --build-arg OSTREE_VER=$(OSTREE_VER) \ -t ostree-build \ . podman run \ diff --git a/rust-bindings/rust/README.md b/rust-bindings/rust/README.md index 35ef22e1..eaae430b 100644 --- a/rust-bindings/rust/README.md +++ b/rust-bindings/rust/README.md @@ -87,9 +87,18 @@ parts). CI includes the LGPL docs in the documentation build. -### Updating ostree -* update the bundled `gir/OSTree-1.0.gir` file +### Updating glib-rs +* update `GIR_VERSION` in `Makefile` to the latest gir commit (matching the target glib-rs version) * `make gir` to regenerate the generated code +* inspect differences in generated code +* update glib-rs dependencies in `Cargo.toml` and `sys/Cargo.toml` + +### Updating ostree +* update `OSTREE_VERSION` in `Makefile` +* `make update-gir-files` to update all gir files +* inspect differences in `OSTree-1.0.gir` +* `make gir` to regenerate the generated code +* add any new feature levels to `Cargo.toml` * update the example feature level in `README.md` in case of a new feature level ### Releases