From d91a1632fce4dce00b96dd974234b0dae22eb209 Mon Sep 17 00:00:00 2001 From: vms Date: Tue, 18 May 2021 21:08:16 +0300 Subject: [PATCH] relaese version --- Cargo.lock | 163 ++++++++++++++------------- crates/it-parser/Cargo.toml | 2 +- crates/module-info-parser/Cargo.toml | 2 +- fluence-app-service/Cargo.toml | 2 +- fluence-faas/Cargo.toml | 6 +- runtime/Cargo.toml | 6 +- tools/repl/Cargo.toml | 2 +- 7 files changed, 94 insertions(+), 89 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a30b1fb..aef8d433 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -721,7 +721,7 @@ dependencies = [ "serde_derive", "serde_json", "toml", - "wasmer-wasi-fl 0.17.1", + "wasmer-wasi-fl 0.17.1 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -761,9 +761,9 @@ dependencies = [ "thiserror", "toml", "wasmer-interface-types-fl", - "wasmer-runtime-core-fl 0.17.0", - "wasmer-runtime-fl 0.17.0", - "wasmer-wasi-fl 0.17.1", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-runtime-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-wasi-fl 0.17.1 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -1544,7 +1544,7 @@ dependencies = [ "thiserror", "walrus", "wasmer-interface-types-fl", - "wasmer-runtime-core-fl 0.17.0", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -1581,7 +1581,7 @@ dependencies = [ "serde", "thiserror", "walrus", - "wasmer-runtime-core-fl 0.17.0", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -1625,9 +1625,9 @@ dependencies = [ "thiserror", "tokio 0.2.25", "wasmer-interface-types-fl", - "wasmer-runtime-core-fl 0.17.0", - "wasmer-runtime-fl 0.17.0", - "wasmer-wasi-fl 0.17.1", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-runtime-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-wasi-fl 0.17.1 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -1845,7 +1845,7 @@ dependencies = [ "serde_json", "termion", "uuid", - "wasmer-wasi-fl 0.17.1", + "wasmer-wasi-fl 0.17.1 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -3360,30 +3360,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "wasmer-clif-backend-fl" -version = "0.17.0" -dependencies = [ - "byteorder", - "cranelift-codegen", - "cranelift-entity", - "cranelift-native", - "libc", - "nix 0.15.0", - "rayon", - "serde", - "serde-bench", - "serde_bytes", - "serde_derive", - "target-lexicon", - "wasmer-clif-fork-frontend", - "wasmer-clif-fork-wasm", - "wasmer-runtime-core-fl 0.17.0", - "wasmer-win-exception-handler 0.17.0", - "wasmparser 0.51.4", - "winapi 0.3.9", -] - [[package]] name = "wasmer-clif-backend-fl" version = "0.17.0" @@ -3410,6 +3386,31 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "wasmer-clif-backend-fl" +version = "0.17.0" +source = "git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument#676a31595a661fad63c35f5631ff5446e8ef0339" +dependencies = [ + "byteorder", + "cranelift-codegen", + "cranelift-entity", + "cranelift-native", + "libc", + "nix 0.15.0", + "rayon", + "serde", + "serde-bench", + "serde_bytes", + "serde_derive", + "target-lexicon", + "wasmer-clif-fork-frontend", + "wasmer-clif-fork-wasm", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-win-exception-handler 0.17.0", + "wasmparser 0.51.4", + "winapi 0.3.9", +] + [[package]] name = "wasmer-clif-fork-frontend" version = "0.59.0" @@ -3485,33 +3486,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "wasmer-runtime-core-fl" -version = "0.17.0" -dependencies = [ - "bincode", - "blake3", - "cc", - "digest 0.8.1", - "errno", - "hex", - "indexmap", - "lazy_static", - "libc", - "nix 0.15.0", - "page_size", - "parking_lot", - "rustc_version", - "serde", - "serde-bench", - "serde_bytes", - "serde_derive", - "smallvec", - "target-lexicon", - "wasmparser 0.51.4", - "winapi 0.3.9", -] - [[package]] name = "wasmer-runtime-core-fl" version = "0.17.0" @@ -3542,15 +3516,31 @@ dependencies = [ ] [[package]] -name = "wasmer-runtime-fl" +name = "wasmer-runtime-core-fl" version = "0.17.0" +source = "git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument#676a31595a661fad63c35f5631ff5446e8ef0339" dependencies = [ + "bincode", + "blake3", + "cc", + "digest 0.8.1", + "errno", + "hex", + "indexmap", "lazy_static", - "memmap", + "libc", + "nix 0.15.0", + "page_size", + "parking_lot", + "rustc_version", "serde", + "serde-bench", + "serde_bytes", "serde_derive", - "wasmer-clif-backend-fl 0.17.0", - "wasmer-runtime-core-fl 0.17.0", + "smallvec", + "target-lexicon", + "wasmparser 0.51.4", + "winapi 0.3.9", ] [[package]] @@ -3568,21 +3558,16 @@ dependencies = [ ] [[package]] -name = "wasmer-wasi-fl" -version = "0.17.1" +name = "wasmer-runtime-fl" +version = "0.17.0" +source = "git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument#676a31595a661fad63c35f5631ff5446e8ef0339" dependencies = [ - "bincode", - "byteorder", - "generational-arena", - "getrandom 0.1.16", - "libc", - "log", + "lazy_static", + "memmap", "serde", - "thiserror", - "time", - "typetag", - "wasmer-runtime-core-fl 0.17.0", - "winapi 0.3.9", + "serde_derive", + "wasmer-clif-backend-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", ] [[package]] @@ -3605,13 +3590,33 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "wasmer-wasi-fl" +version = "0.17.1" +source = "git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument#676a31595a661fad63c35f5631ff5446e8ef0339" +dependencies = [ + "bincode", + "byteorder", + "generational-arena", + "getrandom 0.1.16", + "libc", + "log", + "serde", + "thiserror", + "time", + "typetag", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", + "winapi 0.3.9", +] + [[package]] name = "wasmer-win-exception-handler" version = "0.17.0" +source = "git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument#676a31595a661fad63c35f5631ff5446e8ef0339" dependencies = [ "cc", "libc", - "wasmer-runtime-core-fl 0.17.0", + "wasmer-runtime-core-fl 0.17.0 (git+https://github.com/fluencelabs/wasmer?branch=fluence_instrument)", "winapi 0.3.9", ] diff --git a/crates/it-parser/Cargo.toml b/crates/it-parser/Cargo.toml index 7bbb61f2..83eedf50 100644 --- a/crates/it-parser/Cargo.toml +++ b/crates/it-parser/Cargo.toml @@ -15,7 +15,7 @@ marine-it-interfaces = { path = "../it-interfaces", version = "0.4.0" } anyhow = "1.0.31" walrus = "0.18.0" -wasmer-core = { package = "wasmer-runtime-core-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime-core", version = "0.17.0" } +wasmer-core = { package = "wasmer-runtime-core-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } nom = "5.1" diff --git a/crates/module-info-parser/Cargo.toml b/crates/module-info-parser/Cargo.toml index 0aab48c5..d000e59a 100644 --- a/crates/module-info-parser/Cargo.toml +++ b/crates/module-info-parser/Cargo.toml @@ -13,7 +13,7 @@ path = "src/lib.rs" [dependencies] fluence-sdk-main = "0.6.3" -wasmer-core = { package = "wasmer-runtime-core-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime-core", version = "0.17.0" } +wasmer-core = { package = "wasmer-runtime-core-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } anyhow = "1.0.31" chrono = "0.4.19" diff --git a/fluence-app-service/Cargo.toml b/fluence-app-service/Cargo.toml index a0d3464a..856d0e40 100644 --- a/fluence-app-service/Cargo.toml +++ b/fluence-app-service/Cargo.toml @@ -15,7 +15,7 @@ serde = "=1.0.118" serde_derive = "=1.0.118" serde_json = "1.0.57" toml = "0.5.6" -wasmer-wasi = { package = "wasmer-wasi-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/wasi", version = "0.17.0" } +wasmer-wasi = { package = "wasmer-wasi-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } [features] raw-module-api = ["fluence-faas/raw-module-api"] diff --git a/fluence-faas/Cargo.toml b/fluence-faas/Cargo.toml index 8970b2bf..1f7660ad 100644 --- a/fluence-faas/Cargo.toml +++ b/fluence-faas/Cargo.toml @@ -12,10 +12,10 @@ marine-utils = { path = "../crates/utils", version = "0.2.0" } fluence-sdk-main = { version = "0.6.3", features = ["logger"] } fluence = { version = "0.6.3", features = ["logger"] } -wasmer-runtime = { package = "wasmer-runtime-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime", version = "0.17.0" } +wasmer-runtime = { package = "wasmer-runtime-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } # dynamicfunc-fat-closures allows using state inside DynamicFunc -wasmer-core = { package = "wasmer-runtime-core-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime-core", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } -wasmer-wasi = { package = "wasmer-wasi-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/wasi", version = "0.17.0" } +wasmer-core = { package = "wasmer-runtime-core-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } +wasmer-wasi = { package = "wasmer-wasi-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } toml = "0.5.6" diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index c0b7e326..6f766926 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -17,12 +17,12 @@ marine-it-parser = { path = "../crates/it-parser", version = "0.6.0" } marine-it-generator = { path = "../crates/it-generator", version = "0.5.0" } marine-utils = { path = "../crates/utils", version = "0.2.0" } -wasmer-runtime = { package = "wasmer-runtime-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime", version = "0.17.0" } +wasmer-runtime = { package = "wasmer-runtime-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } # dynamicfunc-fat-closures allows using state inside DynamicFunc -wasmer-core = { package = "wasmer-runtime-core-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/runtime-core", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } +wasmer-core = { package = "wasmer-runtime-core-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } wasmer-it = { package = "wasmer-interface-types-fl", version = "0.20.0" } it-lilo = "0.1.0" -wasmer-wasi = { package = "wasmer-wasi-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/wasi", version = "0.17.0" } +wasmer-wasi = { package = "wasmer-wasi-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0" } multimap = "0.8.1" boolinator = "2.4.0" diff --git a/tools/repl/Cargo.toml b/tools/repl/Cargo.toml index d7102964..a4076d1b 100644 --- a/tools/repl/Cargo.toml +++ b/tools/repl/Cargo.toml @@ -18,7 +18,7 @@ fluence-sdk-main = { version = "0.6.3", features = ["logger"] } anyhow = "1.0.31" clap = "2.33.1" serde_json = "1.0.57" -wasmer-wasi = { package = "wasmer-wasi-fl", path = "/Users/mike/dev/work/fluence/wasm/wasmer/lib/wasi", version = "0.17.0"} +wasmer-wasi = { package = "wasmer-wasi-fl", git = "https://github.com/fluencelabs/wasmer", branch = "fluence_instrument", version = "0.17.0"} env_logger = "0.7.1" check-latest = "1.0.0"