From 73f2498916efa94b162743592a218b207195512f Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Thu, 23 Mar 2023 18:44:00 +0100 Subject: [PATCH] Fixes post 3.2.0-beta.1 release (but needed for the crates publication) --- Cargo.lock | 6 +++--- lib/cli/Cargo.toml | 2 +- lib/registry/Cargo.toml | 2 +- lib/wai-bindgen-wasmer/Cargo.toml | 6 +++++- lib/wasi-types/Cargo.toml | 2 +- lib/wasi/Cargo.toml | 4 ++-- scripts/make-release.py | 2 +- scripts/publish.py | 4 +++- 8 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cf63aa92a69..754f61cc32a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4863,7 +4863,7 @@ dependencies = [ [[package]] name = "wai-bindgen-wasmer" -version = "0.2.3" +version = "0.2.4" dependencies = [ "anyhow", "async-trait", @@ -5385,7 +5385,7 @@ dependencies = [ "wasmer-compiler-singlepass", "wasmer-emscripten", "wasmer-object", - "wasmer-registry 4.0.0", + "wasmer-registry 4.1.0", "wasmer-toml", "wasmer-types", "wasmer-vm", @@ -5640,7 +5640,7 @@ dependencies = [ [[package]] name = "wasmer-registry" -version = "4.0.0" +version = "4.1.0" dependencies = [ "anyhow", "console", diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index ec5281c067a..250a9416a99 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -37,7 +37,7 @@ wasmer-wasix-experimental-io-devices = { version = "0.1.0", path = "../wasi-expe wasmer-wast = { version = "=3.2.0-beta.1", path = "../../tests/lib/wast", optional = true } wasmer-cache = { version = "=3.2.0-beta.1", path = "../cache", features = ["blake3-pure"] } wasmer-types = { version = "=3.2.0-beta.1", path = "../types", features = ["enable-serde"] } -wasmer-registry = { version = "=4.0.0", path = "../registry" } +wasmer-registry = { version = "4.1.0", path = "../registry" } wasmer-object = { version = "=3.2.0-beta.1", path = "../object", optional = true } virtual-fs = { version = "0.1.0", path = "../vfs", default-features = false, features = ["host-fs"] } virtual-net = { version = "0.1.0", path = "../vnet" } diff --git a/lib/registry/Cargo.toml b/lib/registry/Cargo.toml index a607d2bde75..0ad8250f293 100644 --- a/lib/registry/Cargo.toml +++ b/lib/registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmer-registry" -version = "4.0.0" +version = "4.1.0" edition = "2021" license = "MIT" description = "Crate to interact with the wasmer registry (wapm.io), download packages, etc." diff --git a/lib/wai-bindgen-wasmer/Cargo.toml b/lib/wai-bindgen-wasmer/Cargo.toml index 4e103aa4bbe..7614751536b 100644 --- a/lib/wai-bindgen-wasmer/Cargo.toml +++ b/lib/wai-bindgen-wasmer/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wai-bindgen-wasmer" description = "Generate WAI glue for a Rust Wasmer host" -version = "0.2.3" +version = "0.2.4" edition = "2018" categories = ["wasm", "os"] keywords = ["wasm", "webassembly", "wasi", "sandbox", "ABI"] @@ -29,3 +29,7 @@ tracing = ["tracing-lib", "wai-bindgen-wasmer-impl/tracing"] # Enables async support for generated code, although when enabled this still # needs to be configured through the macro invocation. async = ["async-trait", "wai-bindgen-wasmer-impl/async"] + +# Wasmer features +js = ["wasmer/js", "wasmer/std"] +sys = ["wasmer/sys"] diff --git a/lib/wasi-types/Cargo.toml b/lib/wasi-types/Cargo.toml index 8b28a64350a..cd86f37b961 100644 --- a/lib/wasi-types/Cargo.toml +++ b/lib/wasi-types/Cargo.toml @@ -3,7 +3,7 @@ name = "wasmer-wasix-types" version = "0.1.0" description = "WASI and WASIX types for Wasmer WebAssembly runtime" categories = ["wasm", "os"] -keywords = ["wasm", "webassembly", "wasi", "wasix", "sandbox", "ABI"] +keywords = ["wasm", "webassembly", "wasi", "sandbox", "ABI"] authors = ["Wasmer Engineering Team "] repository = "https://github.com/wasmerio/wasmer" license = "MIT" diff --git a/lib/wasi/Cargo.toml b/lib/wasi/Cargo.toml index b3c5b20d1fc..14cbbb81200 100644 --- a/lib/wasi/Cargo.toml +++ b/lib/wasi/Cargo.toml @@ -3,7 +3,7 @@ name = "wasmer-wasix" version = "0.1.0" description = "WASI and WASIX implementation library for Wasmer WebAssembly runtime" categories = ["wasm", "os"] -keywords = ["wasm", "webassembly", "wasi", "wasix", "sandbox", "ABI"] +keywords = ["wasm", "webassembly", "wasi", "sandbox", "ABI"] authors = ["Wasmer Engineering Team "] repository = "https://github.com/wasmerio/wasmer" license = "MIT" @@ -52,7 +52,7 @@ linked_hash_set = { version = "0.1" } # the various compilers wasmer-compiler = { version = "=3.2.0-beta.1", path = "../compiler", features = [ "translator" ], optional = true } http = "0.2.8" -wai-bindgen-wasmer = { path = "../wai-bindgen-wasmer", version = "0.2.3", features = ["tracing"] } +wai-bindgen-wasmer = { path = "../wai-bindgen-wasmer", version = "0.2.4", features = ["tracing"] } heapless = "0.7.16" once_cell = "1.17.0" pin-project = "1.0.12" diff --git a/scripts/make-release.py b/scripts/make-release.py index b5d4cb143ee..602cdb6ac2a 100644 --- a/scripts/make-release.py +++ b/scripts/make-release.py @@ -332,7 +332,7 @@ def make_release(version): if proc.returncode == 0: for line in proc.stdout: line = line.decode("utf-8").rstrip() - if "Merge #" + pr_number in line: + if "Merge pull request #" + pr_number in line: correct_checkout = line else: raise Exception("could not git log branch " + RELEASE_VERSION_WITH_V) diff --git a/scripts/publish.py b/scripts/publish.py index b7bd11b5cb1..974f8bae77b 100644 --- a/scripts/publish.py +++ b/scripts/publish.py @@ -46,7 +46,9 @@ # compiler by default otherwise it won't work standalone "publish_features": { "wasmer-cli": "default,cranelift", - "wasmer-wasi": "sys", + "wasmer-wasix": "sys", + "wasmer-wasix-types": "sys", + "wai-bindgen-wasmer": "sys", }, # workspace members we want to publish but whose path doesn't start by # "./lib/"