Skip to content

Commit

Permalink
Merge pull request #382 from Mossaka/restrictive-version
Browse files Browse the repository at this point in the history
fix(Cargo.toml): restrict wildcard version to major versions
  • Loading branch information
Mossaka authored Nov 1, 2023
2 parents 425ed99 + 84f53cd commit 70af320
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
5 changes: 3 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ tar = "0.4"
tempfile = "3.8"
thiserror = "1.0"
ttrpc = "0.8.0"
wat = "*" # Use whatever version wasmtime will make us pull
windows-sys = { version = "0.48" }
wat = "1.0"
windows-sys = "0.48"
serial_test = "2"

[profile.release]
panic = "abort"
8 changes: 4 additions & 4 deletions crates/containerd-shim-wasm-test-modules/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ license.workspace = true

[dependencies]
anyhow = { workspace = true }
env_logger = "0.10"
env_logger = { workspace = true }
libc = { workspace = true }
log = { workspace = true }
oci-spec = { workspace = true }
serde_json = { workspace = true }
tempfile = "3.8"
tempfile = { workspace = true }

[build-dependencies]
anyhow = { workspace = true }
lazy_static = { version = "1.4.0" }
wat = { version = "1.0.46" }
lazy_static = "1.4.0"
wat = { workspace = true }
3 changes: 2 additions & 1 deletion crates/containerd-shim-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ futures = { version = "0.3.29" }

[target.'cfg(unix)'.dependencies]
caps = "0.5"
dbus = { version = "*", features = ["vendored"] }
# this must match the version pulled by libcontainer
dbus = { version = "0", features = ["vendored"] }
libcontainer = { workspace = true, features = ["libseccomp", "systemd", "v1", "v2"]}
nix = { workspace = true, features = ["sched", "mount"] }
containerd-client = "0.4.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/containerd-shim-wasmedge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ wasmedge-sdk = { version = "0.12.2" }
[dev-dependencies]
containerd-shim-wasm = { workspace = true, features = ["testing"] }
libc = { workspace = true }
serial_test = "*"
serial_test = { workspace = true }

[features]
default = ["standalone", "static"]
Expand Down
2 changes: 1 addition & 1 deletion crates/containerd-shim-wasmer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ wasmer-wasix = { version = "0.12.0" }

[dev-dependencies]
containerd-shim-wasm = { workspace = true, features = ["testing"] }
serial_test = "*"
serial_test = { workspace = true }

[[bin]]
name = "containerd-shim-wasmer-v1"
Expand Down
2 changes: 1 addition & 1 deletion crates/containerd-shim-wasmtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ wasi-common = "11.0"

[dev-dependencies]
containerd-shim-wasm = { workspace = true, features = ["testing"] }
serial_test = "*"
serial_test = { workspace = true }

[[bin]]
name = "containerd-shim-wasmtime-v1"
Expand Down

0 comments on commit 70af320

Please sign in to comment.