Skip to content

Commit

Permalink
deps: Lift wasmer-wasix to be a workspace dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
theduke committed Apr 25, 2024
1 parent 8dfd7c2 commit 3b31d4d
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
# Repo-local crates
wasmer-config = { path = "./lib/config" }
wasmer = { version = "=4.3.0-alpha.1", path = "lib/api", default-features = false }
wasmer-compiler = { version = "=4.3.0-alpha.1", path = "lib/compiler", features = [
Expand All @@ -21,12 +22,14 @@ wasmer-compiler-cranelift = { version = "=4.3.0-alpha.1", path = "lib/compiler-c
wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "lib/compiler-singlepass", optional = true }
wasmer-compiler-llvm = { version = "=4.3.0-alpha.1", path = "lib/compiler-llvm", optional = true }
wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "lib/emscripten", optional = true }
wasmer-wasix = { version = "0.18.4", path = "lib/wasix", optional = true }
wasmer-wasix = { path = "lib/wasix", optional = true }
wasmer-wast = { version = "=4.3.0-alpha.1", path = "tests/lib/wast", optional = true }
wasi-test-generator = { version = "=4.3.0-alpha.1", path = "tests/wasi-wast", optional = true }
wasmer-cache = { version = "=4.3.0-alpha.1", path = "lib/cache", optional = true }
wasmer-types = { version = "=4.3.0-alpha.1", path = "lib/types" }
wasmer-middlewares = { version = "=4.3.0-alpha.1", path = "lib/middlewares", optional = true }

# Third party dependencies
cfg-if = "1.0"
tokio = { version = "1", features = [
"rt",
Expand Down Expand Up @@ -88,6 +91,7 @@ version = "4.3.0-alpha.1"
[workspace.dependencies]
# Repo-local crates
wasmer-config = { path = "./lib/config" }
wasmer-wasix = { path = "./lib/wasix" }

# Wasmer-owned crates
webc = { version = "6.0.0-alpha3", default-features = false, features = ["package"] }
Expand Down
2 changes: 1 addition & 1 deletion lib/c-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "../compiler-s
wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "../emscripten", optional = true }
wasmer-middlewares = { version = "=4.3.0-alpha.1", path = "../middlewares", optional = true }
wasmer-types = { version = "=4.3.0-alpha.1", path = "../types" }
wasmer-wasix = { version = "0.18.4", path = "../wasix", features = ["host-fs", "host-vnet"], optional = true }
wasmer-wasix = { workspace = true, features = ["host-fs", "host-vnet"], optional = true }
webc = { workspace = true, optional = true }
virtual-fs = { version = "0.11.3", path = "../virtual-fs", optional = true, default-features = false, features = ["static-fs"] }
enumset.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ wasmer-compiler-singlepass = { version = "=4.3.0-alpha.1", path = "../compiler-s
wasmer-compiler-llvm = { version = "=4.3.0-alpha.1", path = "../compiler-llvm", optional = true }
wasmer-emscripten = { version = "=4.3.0-alpha.1", path = "../emscripten" }
wasmer-vm = { version = "=4.3.0-alpha.1", path = "../vm", optional = true }
wasmer-wasix = { version = "0.18.4", path = "../wasix", features = [
wasmer-wasix = { workspace = true, features = [
"logging",
"webc_runner_rt_wcgi",
"webc_runner_rt_dcgi",
Expand Down
2 changes: 1 addition & 1 deletion lib/sys-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tracing = "0.1.37"
libc = { version = "^0.2", default-features = false }

[dev-dependencies]
wasmer-wasix = { path = "../wasix", version = "0.18.4" }
wasmer-wasix.workspace = true
wasmer = { path = "../api", version = "=4.3.0-alpha.1", default-features = false, features = ["sys", "compiler", "cranelift"] }
tracing-subscriber = { version = "0.3.16", features = ["fmt"] }
tracing = "0.1.37"
Expand Down
5 changes: 3 additions & 2 deletions tests/lib/wast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ readme = "README.md"
edition = "2018"

[dependencies]
anyhow = "1.0"
wasmer-wasix.workspace = true
wasmer = { path = "../../../lib/api", version = "=4.3.0-alpha.1", default-features = false }
wasmer-wasix = { path = "../../../lib/wasix", version = "0.18.4" }
virtual-fs = { path = "../../../lib/virtual-fs", version = "0.11.3" }

anyhow = "1.0"
wast = "38.0"
serde = "1"
tempfile = "3.6.0"
Expand Down

0 comments on commit 3b31d4d

Please sign in to comment.