Skip to content

Use published, versioned bootc internal crates #403

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

Merged
jeckersb merged 1 commit into from
Oct 5, 2026
Merged

Use published, versioned bootc internal crates #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions crates/kit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ cpio = "0.4"
[target.'cfg(target_os = "linux")'.dependencies]
bcvk-qemu = { path = "../bcvk-qemu" }
cap-std-ext = { workspace = true }
bootc-mount = { package = "bootc-internal-mount", git = "https://github.com/bootc-dev/bootc", rev = "83d15891428cda862c5c732397f5dd7c81dc4a23" }
bootc-utils = { package = "bootc-internal-utils", git = "https://github.com/bootc-dev/bootc", rev = "83d15891428cda862c5c732397f5dd7c81dc4a23" }
bootc-mount = { package = "bootc-internal-mount", version = "1.16.14" }
bootc-utils = { package = "bootc-internal-utils", version = "1.16.14" }

@cgwalters cgwalters Oct 5, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think renovate may still try to bump these separately. The best fix is to re-export one of them from the other; most likely bootc-mount should re-export bootc_utils.

@jeckersb jeckersb Oct 5, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they'll just all get bundled together into the "rust" one like #400

@cgwalters cgwalters Oct 5, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah OK yeah probably true, but it's still a best practice to do the "re-export" thing so there's only one version. It's what we did with composefs-rs for bootc

@jeckersb jeckersb Oct 5, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the re-export is necessary here because although mount uses utils (only for CommandRunExt) it doesn't leak any of the API from utils into its own API. The problem with bootc/composesfs-rs was that bootc exposed parts of the composefs-rs API in its own API, so you could get into version mismatches where the "inner" version of composefs-rs that bootc was built against was different from the external version used by the caller.

In the case here with bcvk it doesn't really matter too much except for a slightly larger binary size if the two diverge, but I think that's probably trivial in the grand scheme of things.

rustix = { version = "1", features = ["thread", "net", "fs", "pipe", "system", "process", "mount"] }
vsock = "0.5"
nix = { version = "0.31", features = ["socket"] }
Expand Down
8 changes: 0 additions & 8 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,5 @@
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>bootc-dev/infra:renovate-shared-config.json"
],
"packageRules": [
{
"description": ["Group bootc crates so they stay in sync"],
"matchManagers": ["cargo"],
"matchPackageNames": ["bootc-mount", "bootc-utils"],
"groupName": "bootc crates"
}
]
}
Loading