From 0cde61db811671efa671bbe1331a55449a083b4d Mon Sep 17 00:00:00 2001 From: "bootc-bot[bot]" <225049296+bootc-bot[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2026 00:15:11 +0000 Subject: [PATCH 1/2] Release 1.15.2 Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Signed-off-by: Colin Walters --- Cargo.lock | 8 ++++---- crates/blockdev/Cargo.toml | 6 +++--- crates/cli/Cargo.toml | 2 +- crates/lib/Cargo.toml | 8 ++++---- crates/mount/Cargo.toml | 4 ++-- crates/ostree-ext/Cargo.toml | 2 +- crates/system-reinstall-bootc/Cargo.toml | 4 ++-- crates/sysusers/Cargo.toml | 2 +- crates/tmpfiles/Cargo.toml | 2 +- crates/utils/Cargo.toml | 2 +- tmt/plans/integration.fmf | 1 - 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f1340ffa..ec194ad2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -236,7 +236,7 @@ dependencies = [ [[package]] name = "bootc-internal-blockdev" -version = "1.15.1" +version = "1.15.2" dependencies = [ "anyhow", "bootc-internal-mount", @@ -256,7 +256,7 @@ dependencies = [ [[package]] name = "bootc-internal-mount" -version = "1.15.1" +version = "1.15.2" dependencies = [ "anyhow", "bootc-internal-utils", @@ -273,7 +273,7 @@ dependencies = [ [[package]] name = "bootc-internal-utils" -version = "1.15.1" +version = "1.15.2" dependencies = [ "anstream 1.0.0", "anyhow", @@ -305,7 +305,7 @@ dependencies = [ [[package]] name = "bootc-lib" -version = "1.15.1" +version = "1.15.2" dependencies = [ "anstream 1.0.0", "anstyle", diff --git a/crates/blockdev/Cargo.toml b/crates/blockdev/Cargo.toml index 4f9560dab..3e6154777 100644 --- a/crates/blockdev/Cargo.toml +++ b/crates/blockdev/Cargo.toml @@ -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.1" +version = "1.15.2" [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } -bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.2" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 9e7bc78cd..3f5932139 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -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.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies anstream = { workspace = true } diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 2d7f46a77..a33d1aa6b 100644 --- a/crates/lib/Cargo.toml +++ b/crates/lib/Cargo.toml @@ -6,7 +6,7 @@ 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.1" +version = "1.15.2" # In general we try to keep this pinned to what's in the latest RHEL9. rust-version = "1.85.0" @@ -14,12 +14,12 @@ include = ["/src", "LICENSE-APACHE", "LICENSE-MIT"] [dependencies] # Internal crates -bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "1.15.1" } +bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "1.15.2" } bootc-kernel-cmdline = { path = "../kernel_cmdline", version = "0.0.0" } -bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.2" } bootc-sysusers = { path = "../sysusers" } bootc-tmpfiles = { path = "../tmpfiles" } -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } ostree-ext = { path = "../ostree-ext", features = ["bootc"] } etc-merge = { path = "../etc-merge" } bootc-initramfs-setup = { path = "../initramfs" } diff --git a/crates/mount/Cargo.toml b/crates/mount/Cargo.toml index 767369ee4..90032187e 100644 --- a/crates/mount/Cargo.toml +++ b/crates/mount/Cargo.toml @@ -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.1" +version = "1.15.2" [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/ostree-ext/Cargo.toml b/crates/ostree-ext/Cargo.toml index b2566dcfd..8bd302934 100644 --- a/crates/ostree-ext/Cargo.toml +++ b/crates/ostree-ext/Cargo.toml @@ -9,7 +9,7 @@ version = "0.15.3" [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/system-reinstall-bootc/Cargo.toml b/crates/system-reinstall-bootc/Cargo.toml index 627823443..29b27a0fe 100644 --- a/crates/system-reinstall-bootc/Cargo.toml +++ b/crates/system-reinstall-bootc/Cargo.toml @@ -15,8 +15,8 @@ platforms = ["*-unknown-linux-gnu"] [dependencies] # Internal crates -bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.1" } -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.15.2" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies anstream = { workspace = true } diff --git a/crates/sysusers/Cargo.toml b/crates/sysusers/Cargo.toml index 53a2d6401..7ccba32c0 100644 --- a/crates/sysusers/Cargo.toml +++ b/crates/sysusers/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/tmpfiles/Cargo.toml b/crates/tmpfiles/Cargo.toml index 8d598d1d6..7de7b81ab 100644 --- a/crates/tmpfiles/Cargo.toml +++ b/crates/tmpfiles/Cargo.toml @@ -7,7 +7,7 @@ publish = false [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.1" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.15.2" } # Workspace dependencies camino = { workspace = true } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index ac35f8461..c8d5717c8 100644 --- a/crates/utils/Cargo.toml +++ b/crates/utils/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "bootc-internal-utils" description = "Internal implementation component of bootc; do not use" -version = "1.15.1" +version = "1.15.2" edition = "2024" license = "MIT OR Apache-2.0" repository = "https://github.com/bootc-dev/bootc" diff --git a/tmt/plans/integration.fmf b/tmt/plans/integration.fmf index 855c83092..13386300a 100644 --- a/tmt/plans/integration.fmf +++ b/tmt/plans/integration.fmf @@ -261,5 +261,4 @@ execute: how: fmf test: - /tmt/tests/tests/test-42-loader-entries-source - extra-fixme_skip_if_composefs: true # END GENERATED PLANS From a4d01b0bed0e2cc31ec449de19d71599595b9d63 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 30 Apr 2026 11:38:55 -0400 Subject: [PATCH 2/2] tmt: Mark test-42-loader-entries-source as fixme_skip_if_composefs The test was added in commit fb8c6682 but only the generated integration.fmf was annotated to skip on composefs; the source of truth (the test file metadata) was missing the annotation. Add it so the generated plan stays consistent with the test file. Signed-off-by: Colin Walters --- tmt/plans/integration.fmf | 1 + tmt/tests/booted/test-loader-entries-source.nu | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tmt/plans/integration.fmf b/tmt/plans/integration.fmf index 13386300a..855c83092 100644 --- a/tmt/plans/integration.fmf +++ b/tmt/plans/integration.fmf @@ -261,4 +261,5 @@ execute: how: fmf test: - /tmt/tests/tests/test-42-loader-entries-source + extra-fixme_skip_if_composefs: true # END GENERATED PLANS diff --git a/tmt/tests/booted/test-loader-entries-source.nu b/tmt/tests/booted/test-loader-entries-source.nu index 6a6223bc5..b52656798 100644 --- a/tmt/tests/booted/test-loader-entries-source.nu +++ b/tmt/tests/booted/test-loader-entries-source.nu @@ -1,4 +1,6 @@ # number: 42 +# extra: +# fixme_skip_if_composefs: true # tmt: # summary: Test bootc loader-entries set-options-for-source # duration: 30m