From a3f211ff194efb05a038749aa0569ae010713c95 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Thu, 9 Jul 2026 20:05:41 +0000 Subject: [PATCH] libs: Inherit oci-spec from the root workspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumping oci-spec to 0.10.0 in the root manifest broke the kata-agent build: kata-types, protocols and kata-sys-util declare their own oci-spec pin (0.8.1) instead of inheriting the workspace dependency, so the bump left them behind on 0.8.4 while the agent and runtime-rs crates moved to 0.10.0. Since 0.x lines are semver-incompatible, cargo compiles both versions side by side, and every oci-spec type these libs expose in their public API (e.g. oci_spec::runtime::Spec) no longer matches the type the agent expects — a wall of "expected Spec, found Spec" mismatches. Switch the three crates to `workspace = true` like the other members so the root manifest is the single source of truth and future bumps apply to the whole tree atomically. The `runtime` feature is inherited from the workspace declaration. No resolution change yet: both sides currently resolve to 0.8.4; the actual bump follows in the next commit. Assisted-by: Claude Fable 5 Signed-off-by: Zvonko Kaiser --- src/libs/kata-sys-util/Cargo.toml | 2 +- src/libs/kata-types/Cargo.toml | 2 +- src/libs/protocols/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/kata-sys-util/Cargo.toml b/src/libs/kata-sys-util/Cargo.toml index 43c912ad15..928eb29c53 100644 --- a/src/libs/kata-sys-util/Cargo.toml +++ b/src/libs/kata-sys-util/Cargo.toml @@ -28,7 +28,7 @@ hex = "0.4.3" pci-ids = "0.2.6" kata-types = { path = "../kata-types" } -oci-spec = { version = "0.8.1", features = ["runtime"] } +oci-spec = { workspace = true } runtime-spec = { path = "../runtime-spec" } [dev-dependencies] diff --git a/src/libs/kata-types/Cargo.toml b/src/libs/kata-types/Cargo.toml index 6bf7bbfa6f..c272ff10e5 100644 --- a/src/libs/kata-types/Cargo.toml +++ b/src/libs/kata-types/Cargo.toml @@ -30,7 +30,7 @@ sysinfo = { workspace = true } sha2 = { workspace = true } flate2 = "1.1" nix = { workspace = true } -oci-spec = { version = "0.8.1", features = ["runtime"] } +oci-spec = { workspace = true } gpt = "4.1.0" scopeguard = "1.0.0" crc = "3.4.0" diff --git a/src/libs/protocols/Cargo.toml b/src/libs/protocols/Cargo.toml index 39998ad750..84d33ccdde 100644 --- a/src/libs/protocols/Cargo.toml +++ b/src/libs/protocols/Cargo.toml @@ -16,7 +16,7 @@ async-trait = { version = "0.1.42", optional = true } protobuf = { version = "3.7.2" } serde = { version = "1.0.130", features = ["derive"] } serde_json = "1.0.68" -oci-spec = { version = "0.8.1", features = ["runtime"] } +oci-spec = { workspace = true } [build-dependencies] ttrpc-codegen = "0.6.0"