Skip to content

[pull] main from bootc-dev:main #138

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
pull merged 2 commits into from
Apr 14, 2026
Merged

[pull] main from bootc-dev:main #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d221194
Release 1.15.1
bootc-bot[bot] Apr 13, 2026
bd93a1e
tmt: Rename multi-device-esp test file to match generated code
ckyrouac Apr 13, 2026
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
8 changes: 4 additions & 4 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.

6 changes: 3 additions & 3 deletions crates/blockdev/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ edition = "2024"
license = "MIT OR Apache-2.0"
name = "bootc-internal-blockdev"
repository = "https://github.com/bootc-dev/bootc"
version = "1.15.0"
version = "1.15.1"

[dependencies]
# Internal crates
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" }

# Workspace dependencies
anyhow = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ platforms = ["*-unknown-linux-gnu"]
[dependencies]
# Internal crates
bootc-lib = { version = "1.15", path = "../lib" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
anstream = { workspace = true }
Expand Down
8 changes: 4 additions & 4 deletions crates/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ name = "bootc-lib"
repository = "https://github.com/bootc-dev/bootc"
# The intention is we'll follow semver here, even though this
# project isn't actually published as a crate.
version = "1.15.0"
version = "1.15.1"
# In general we try to keep this pinned to what's in the latest RHEL9.
rust-version = "1.85.0"

include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"]

[dependencies]
# Internal crates
bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "1.15.0" }
bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "1.15.1" }
bootc-kernel-cmdline = { path = "../kernel_cmdline", version = "0.0.0" }
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.0" }
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" }
bootc-sysusers = { path = "../sysusers" }
bootc-tmpfiles = { path = "../tmpfiles" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }
ostree-ext = { path = "../ostree-ext", features = ["bootc"] }
etc-merge = { path = "../etc-merge" }
bootc-initramfs-setup = { path = "../initramfs" }
Expand Down
4 changes: 2 additions & 2 deletions crates/mount/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ edition = "2024"
license = "MIT OR Apache-2.0"
name = "bootc-internal-mount"
repository = "https://github.com/bootc-dev/bootc"
version = "1.15.0"
version = "1.15.1"

[dependencies]
# Internal crates
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
anyhow = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/ostree-ext/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.15.3"

[dependencies]
# Internal crates
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
anyhow = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/system-reinstall-bootc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ platforms = ["*-unknown-linux-gnu"]

[dependencies]
# Internal crates
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
anstream = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/sysusers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
# Internal crates
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
anyhow = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/tmpfiles/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ publish = false

[dependencies]
# Internal crates
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.0" }
bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" }

# Workspace dependencies
camino = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "bootc-internal-utils"
description = "Internal implementation component of bootc; do not use"
version = "1.15.0"
version = "1.15.1"
edition = "2024"
license = "MIT OR Apache-2.0"
repository = "https://github.com/bootc-dev/bootc"
Expand Down
18 changes: 7 additions & 11 deletions tmt/plans/integration.fmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ execute:
test:
- /tmt/tests/tests/test-32-install-to-filesystem-var-mount

/plan-32-multi-device-esp:
summary: Test multi-device ESP detection for to-existing-root
discover:
how: fmf
test:
- /tmt/tests/tests/test-32-multi-device-esp

/plan-33-bib-build:
summary: Test building a qcow2 disk image with bootc-image-builder
discover:
Expand Down Expand Up @@ -239,15 +246,4 @@ execute:
test:
- /tmt/tests/tests/test-40-install-karg-delete
extra-fixme_skip_if_composefs: true

/plan-41-multi-device-esp:
summary: Test multi-device ESP detection for to-existing-root
provision+:
hardware:
boot:
method: uefi
discover:
how: fmf
test:
- /tmt/tests/test-41-multi-device-esp
# END GENERATED PLANS
0 tmt/tests/test-41-multi-device-esp.fmf → tmt/tests/test-32-multi-device-esp.fmf
View file
Open in desktop
File renamed without changes.
5 changes: 5 additions & 0 deletions tmt/tests/tests.fmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ check:
- e2fsprogs
test: bash booted/test-install-to-filesystem-var-mount.sh

/test-32-multi-device-esp:
summary: Test multi-device ESP detection for to-existing-root
duration: 60m
test: nu booted/test-multi-device-esp.nu

/test-33-bib-build:
summary: Test building a qcow2 disk image with bootc-image-builder
duration: 45m
Expand Down
Loading