From 265ecc9b126a9ab2583792bcb93541a755059642 Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Thu, 25 Apr 2024 16:59:52 +0330 Subject: [PATCH 1/4] Update wasmer-config dependency --- Cargo.lock | 25 ++++++++++++------------- Cargo.toml | 1 - lib/backend-api/Cargo.toml | 2 +- lib/cli/Cargo.toml | 2 +- lib/config/Cargo.toml | 2 +- lib/registry/Cargo.toml | 2 +- lib/wasix/Cargo.toml | 2 +- 7 files changed, 17 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4dc7c00bc81..3868e305b79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6256,7 +6256,7 @@ dependencies = [ "tracing", "url", "uuid", - "wasmer-config 0.1.0", + "wasmer-config 0.1.1", "webc", ] @@ -6446,7 +6446,7 @@ dependencies = [ "wasmer-compiler-cranelift", "wasmer-compiler-llvm", "wasmer-compiler-singlepass", - "wasmer-config 0.1.0", + "wasmer-config 0.1.1", "wasmer-emscripten", "wasmer-object", "wasmer-registry", @@ -6570,20 +6570,20 @@ dependencies = [ [[package]] name = "wasmer-config" version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b405c9856adaf65ee91eeeeaac6fcc6b127188648c60ae4e89de63f506c74e6" dependencies = [ "anyhow", "bytesize", "derive_builder", "hex", - "indexmap 2.2.6", - "pretty_assertions", + "indexmap 1.9.3", "schemars", "semver 1.0.22", "serde", "serde_cbor", "serde_json", "serde_yaml 0.9.34+deprecated", - "tempfile", "thiserror", "toml 0.8.12", "url", @@ -6591,21 +6591,21 @@ dependencies = [ [[package]] name = "wasmer-config" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b405c9856adaf65ee91eeeeaac6fcc6b127188648c60ae4e89de63f506c74e6" +version = "0.1.1" dependencies = [ "anyhow", "bytesize", "derive_builder", "hex", - "indexmap 1.9.3", + "indexmap 2.2.6", + "pretty_assertions", "schemars", "semver 1.0.22", "serde", "serde_cbor", "serde_json", "serde_yaml 0.9.34+deprecated", + "tempfile", "thiserror", "toml 0.8.12", "url", @@ -6784,7 +6784,7 @@ dependencies = [ "toml 0.5.11", "tracing", "url", - "wasmer-config 0.1.0", + "wasmer-config 0.1.1", "wasmer-wasm-interface", "wasmparser 0.121.2", "webc", @@ -6918,7 +6918,7 @@ dependencies = [ "wasm-bindgen-futures", "wasm-bindgen-test", "wasmer", - "wasmer-config 0.1.0", + "wasmer-config 0.1.1", "wasmer-emscripten", "wasmer-journal", "wasmer-types", @@ -7015,7 +7015,6 @@ dependencies = [ "wasmer-compiler-cranelift", "wasmer-compiler-llvm", "wasmer-compiler-singlepass", - "wasmer-config 0.1.0", "wasmer-emscripten", "wasmer-middlewares", "wasmer-types", @@ -7161,7 +7160,7 @@ dependencies = [ "thiserror", "toml 0.7.8", "url", - "wasmer-config 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "wasmer-config 0.1.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index fa699fc4537..b67a7b0ca79 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,6 @@ rust-version.workspace = true version.workspace = true [dependencies] -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 = [ "compiler", diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml index bfbe02ebd23..285bf98f319 100644 --- a/lib/backend-api/Cargo.toml +++ b/lib/backend-api/Cargo.toml @@ -17,7 +17,7 @@ rust-version.workspace = true [dependencies] # Wasmer dependencies. edge-schema.workspace = true -wasmer-config.workspace = true +wasmer-config = { version = "0.1.1", path = "../config" } webc.workspace = true # crates.io dependencies. diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index c2fc0979c09..6f1d08228a1 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -129,7 +129,7 @@ serde = { version = "1.0.147", features = ["derive"] } dirs = { version = "4.0" } serde_json = { version = "1.0" } target-lexicon = { version = "0.12", features = ["std"] } -wasmer-config = { workspace = true } +wasmer-config = { version = "0.1.1", path = "../config" } indexmap = "1.9.2" walkdir = "2.3.2" regex = "1.6.0" diff --git a/lib/config/Cargo.toml b/lib/config/Cargo.toml index 5c1f35dd2dc..c96aa7fec8d 100644 --- a/lib/config/Cargo.toml +++ b/lib/config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-config" -version = "0.1.0" +version = "0.1.1" description = "Configuration types for Wasmer." edition.workspace = true license.workspace = true diff --git a/lib/registry/Cargo.toml b/lib/registry/Cargo.toml index 08bd3aea7e6..9f7386c013a 100644 --- a/lib/registry/Cargo.toml +++ b/lib/registry/Cargo.toml @@ -49,7 +49,7 @@ tokio-tungstenite = {version = "0.20", features = ["rustls-tls-native-roots"]} toml.workspace = true tracing = "0.1.40" url = "2.3.1" -wasmer-config = { workspace = true } +wasmer-config = { version = "0.1.1", path = "../config" } wasmer-wasm-interface = { version = "4.3.0-alpha.1", path = "../wasm-interface", optional = true } wasmparser = { workspace = true, optional = true } whoami = "1.2.3" diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index 29d6fcf5545..92600e4a6d0 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -21,7 +21,7 @@ virtual-fs = { path = "../virtual-fs", version = "0.11.3", default-features = fa virtual-net = { path = "../virtual-net", version = "0.6.5", default-features = false, features = ["rkyv"] } wasmer-journal = { path = "../journal", version = "0.1.0", default-features = false } wasmer-emscripten = { path = "../emscripten", version = "=4.3.0-alpha.1", optional = true } -wasmer-config.workspace = true +wasmer-config = { version = "0.1.1", path = "../config" } xxhash-rust = { version = "0.8.8", features = ["xxh64"] } rusty_pool = { version = "0.7.0", optional = true } From f90b515e8da862c385e012e54d3e7d995f3e6953 Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Thu, 25 Apr 2024 17:06:36 +0330 Subject: [PATCH 2/4] Take dev-dependencies into account for publishing order --- scripts/publish.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/scripts/publish.py b/scripts/publish.py index bc495081135..553eab2fb9d 100644 --- a/scripts/publish.py +++ b/scripts/publish.py @@ -169,6 +169,19 @@ def return_dependencies(toml) -> typing.List[str]: ) ) ) + if "dev-dependencies" in toml: + acc.update( + list( + map( + lambda dep: dep[1]["package"] + if "package" in dep[1] + else dep[0], + filter( + check_local_dep_fn, toml["dev-dependencies"].items() + ), + ) + ) + ) if "target" in toml: stack.append(toml["target"]) for key, value in toml.items(): From 17c2acc5b1dc3b0646e16fa9168d506ee46e96f2 Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Thu, 25 Apr 2024 17:07:40 +0330 Subject: [PATCH 3/4] Update wasmer-journal dependency --- Cargo.lock | 2 +- lib/journal/Cargo.toml | 2 +- lib/wasix/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3868e305b79..8c057e045a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6700,7 +6700,7 @@ version = "4.3.0-alpha.1" [[package]] name = "wasmer-journal" -version = "0.1.1" +version = "0.1.2" dependencies = [ "anyhow", "async-trait", diff --git a/lib/journal/Cargo.toml b/lib/journal/Cargo.toml index bfc677cda38..5282a5e100d 100644 --- a/lib/journal/Cargo.toml +++ b/lib/journal/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-journal" -version = "0.1.1" +version = "0.1.2" description = "Journaling functionality used by Wasmer to save and restore WASM state" authors.workspace = true edition.workspace = true diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml index 92600e4a6d0..002d99c7da1 100644 --- a/lib/wasix/Cargo.toml +++ b/lib/wasix/Cargo.toml @@ -19,7 +19,7 @@ wasmer = { path = "../api", version = "=4.3.0-alpha.1", default-features = false virtual-mio = { path = "../virtual-io", version = "0.3.1", default-features = false } virtual-fs = { path = "../virtual-fs", version = "0.11.3", default-features = false, features = ["webc-fs"] } virtual-net = { path = "../virtual-net", version = "0.6.5", default-features = false, features = ["rkyv"] } -wasmer-journal = { path = "../journal", version = "0.1.0", default-features = false } +wasmer-journal = { path = "../journal", version = "0.1.2", default-features = false } wasmer-emscripten = { path = "../emscripten", version = "=4.3.0-alpha.1", optional = true } wasmer-config = { version = "0.1.1", path = "../config" } From 5cb7a9974111483c5737dc0e73ec14e643358afb Mon Sep 17 00:00:00 2001 From: Arshia Ghafoori Date: Thu, 25 Apr 2024 17:36:27 +0330 Subject: [PATCH 4/4] Update version of wasmer-config dep of webc crate --- Cargo.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c057e045a7..96cdf4c3a8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6569,21 +6569,21 @@ dependencies = [ [[package]] name = "wasmer-config" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b405c9856adaf65ee91eeeeaac6fcc6b127188648c60ae4e89de63f506c74e6" +version = "0.1.1" dependencies = [ "anyhow", "bytesize", "derive_builder", "hex", - "indexmap 1.9.3", + "indexmap 2.2.6", + "pretty_assertions", "schemars", "semver 1.0.22", "serde", "serde_cbor", "serde_json", "serde_yaml 0.9.34+deprecated", + "tempfile", "thiserror", "toml 0.8.12", "url", @@ -6592,20 +6592,20 @@ dependencies = [ [[package]] name = "wasmer-config" version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7439f813ad16b3fc8cbf2be3b54192e2c4b0a4c213d1fb3d7cf82da249c39aea" dependencies = [ "anyhow", "bytesize", "derive_builder", "hex", "indexmap 2.2.6", - "pretty_assertions", "schemars", "semver 1.0.22", "serde", "serde_cbor", "serde_json", "serde_yaml 0.9.34+deprecated", - "tempfile", "thiserror", "toml 0.8.12", "url", @@ -7160,7 +7160,7 @@ dependencies = [ "thiserror", "toml 0.7.8", "url", - "wasmer-config 0.1.0", + "wasmer-config 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]]