diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a9fc8d037..fc45584b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -267,7 +267,8 @@ jobs: variant: [ostree, composefs] filesystem: ["ext4", "xfs"] # TODO: Remove "grub" once "grub-cc" is stable - bootloader: ["grub", "grub-cc", "systemd"] + # bootloader: ["grub", "grub-cc", "systemd"] + bootloader: ["grub", "systemd"] boot_type: ["bls", "uki"] seal_state: ["sealed", "unsealed"] @@ -297,20 +298,20 @@ jobs: bootloader: systemd # For now only have grub-cc tests in F44 - - test_os: fedora-45 - bootloader: grub-cc - - test_os: fedora-43 - bootloader: grub-cc - - test_os: centos-9 - bootloader: grub-cc - - test_os: centos-10 - bootloader: grub-cc - # Not in ostree - - variant: ostree - bootloader: grub-cc - # Not yet "sealed" - - bootloader: grub-cc - seal_state: sealed + # - test_os: fedora-45 + # bootloader: grub-cc + # - test_os: fedora-43 + # bootloader: grub-cc + # - test_os: centos-9 + # bootloader: grub-cc + # - test_os: centos-10 + # bootloader: grub-cc + # # Not in ostree + # - variant: ostree + # bootloader: grub-cc + # # Not yet "sealed" + # - bootloader: grub-cc + # seal_state: sealed runs-on: ubuntu-24.04 @@ -406,6 +407,10 @@ jobs: matrix: test_os: ${{ fromJson(needs.compute-ci-level.outputs.upgrade_os_matrix) }} variant: [ostree, composefs] + # TODO: Re-enable this after 1.16.8 is released + exclude: + - test_os: fedora-44 + variant: composefs runs-on: ubuntu-24.04 diff --git a/Cargo.lock b/Cargo.lock index 96a2f53a1..b99032d57 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,7 +275,7 @@ dependencies = [ [[package]] name = "bootc-internal-blockdev" -version = "1.16.7" +version = "1.16.8" dependencies = [ "anyhow", "bootc-internal-mount", @@ -295,7 +295,7 @@ dependencies = [ [[package]] name = "bootc-internal-mount" -version = "1.16.7" +version = "1.16.8" dependencies = [ "anyhow", "bootc-internal-utils", @@ -312,7 +312,7 @@ dependencies = [ [[package]] name = "bootc-internal-utils" -version = "1.16.7" +version = "1.16.8" dependencies = [ "anstream", "anyhow", @@ -334,7 +334,7 @@ dependencies = [ [[package]] name = "bootc-lib" -version = "1.16.7" +version = "1.16.8" dependencies = [ "anstream", "anstyle", diff --git a/crates/blockdev/Cargo.toml b/crates/blockdev/Cargo.toml index f67ed4742..092a3b444 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.16.7" +version = "1.16.8" [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.7" } -bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.16.8" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index bdc0423ad..7839c059f 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.16", path = "../lib" } -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies anstream = { workspace = true } diff --git a/crates/lib/Cargo.toml b/crates/lib/Cargo.toml index 171ae447c..c53a1c245 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.16.7" +version = "1.16.8" # 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.16.7" } +bootc-blockdev = { package = "bootc-internal-blockdev", path = "../blockdev", version = "1.16.8" } linux-kernel-cmdline = { workspace = true } -bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.16.7" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.16.8" } bootc-sysusers = { path = "../sysusers" } bootc-tmpfiles = { path = "../tmpfiles" } -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } 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 64cdea95b..1b162dad2 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.16.7" +version = "1.16.8" [dependencies] # Internal crates -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/ostree-ext/Cargo.toml b/crates/ostree-ext/Cargo.toml index 3195038e5..fbe0985e0 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.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/system-reinstall-bootc/Cargo.toml b/crates/system-reinstall-bootc/Cargo.toml index 09aa9fa39..444ca2cfc 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.16.7" } -bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.7" } +bootc-mount = { package = "bootc-internal-mount", path = "../mount", version = "1.16.8" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies anstream = { workspace = true } diff --git a/crates/sysusers/Cargo.toml b/crates/sysusers/Cargo.toml index de7b1acb3..d366671f6 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.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies anyhow = { workspace = true } diff --git a/crates/tmpfiles/Cargo.toml b/crates/tmpfiles/Cargo.toml index addfa8309..16f3a89e1 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.16.7" } +bootc-utils = { package = "bootc-internal-utils", path = "../utils", version = "1.16.8" } # Workspace dependencies camino = { workspace = true } diff --git a/crates/utils/Cargo.toml b/crates/utils/Cargo.toml index 543639096..dcc608f7f 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.16.7" +version = "1.16.8" edition = "2024" license = "MIT OR Apache-2.0" repository = "https://github.com/bootc-dev/bootc"