From 092538cc547d246444c45c87ec9d07c30219289d Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 26 Mar 2020 21:53:42 -0700 Subject: [PATCH] Test 0.14 (#1417) * Bump Wasmtime to 0.14.0. * Update the publish script for the wiggle crate wiggle. * More fixes. * Fix lightbeam depenency version. * cargo update * Cargo update wasi-tests too. And add cargo update to the version-bump scripts. --- Cargo.lock | 60 +++++++++++----------- Cargo.toml | 20 ++++---- RELEASES.md | 10 +++- crates/api/Cargo.toml | 12 ++--- crates/c-api/Cargo.toml | 2 +- crates/debug/Cargo.toml | 4 +- crates/environ/Cargo.toml | 4 +- crates/fuzzing/Cargo.toml | 4 +- crates/jit/Cargo.toml | 10 ++-- crates/lightbeam/Cargo.toml | 2 +- crates/misc/py/Cargo.toml | 6 +-- crates/misc/run-examples/Cargo.toml | 2 +- crates/misc/rust/Cargo.toml | 8 +-- crates/misc/rust/macro/Cargo.toml | 2 +- crates/obj/Cargo.toml | 4 +- crates/profiling/Cargo.toml | 6 +-- crates/runtime/Cargo.toml | 4 +- crates/test-programs/Cargo.toml | 8 +-- crates/test-programs/wasi-tests/Cargo.lock | 2 +- crates/test-programs/wasi-tests/Cargo.toml | 2 +- crates/wasi-common/Cargo.toml | 10 ++-- crates/wasi-common/wig/Cargo.toml | 2 +- crates/wasi-common/winx/Cargo.toml | 2 +- crates/wasi-common/yanix/Cargo.toml | 2 +- crates/wasi/Cargo.toml | 12 ++--- crates/wast/Cargo.toml | 4 +- crates/wiggle/Cargo.toml | 6 +-- crates/wiggle/generate/Cargo.toml | 2 +- crates/wiggle/macro/Cargo.toml | 4 +- crates/wiggle/test-helpers/Cargo.toml | 4 +- scripts/bump-cranelift-version.sh | 4 ++ scripts/bump-wasmtime-version.sh | 13 ++++- scripts/publish-wasmtime.sh | 6 +-- 33 files changed, 132 insertions(+), 111 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fabef99360..48b93f46f5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "indoc" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9553c1e16c114b8b77ebeb329e5f2876eed62a8d51178c8bc6bff0d65f98f8" +checksum = "79255cf29f5711995ddf9ec261b4057b1deb34e66c90656c201e41376872c544" dependencies = [ "indoc-impl", "proc-macro-hack", @@ -1037,9 +1037,9 @@ dependencies = [ [[package]] name = "indoc-impl" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b714fc08d0961716390977cdff1536234415ac37b509e34e5a983def8340fb75" +checksum = "54554010aa3d17754e484005ea0022f1c93839aabc627c2c55f3d7b47206134c" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -1124,7 +1124,7 @@ dependencies = [ [[package]] name = "lightbeam" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "capstone", @@ -1779,7 +1779,7 @@ dependencies = [ [[package]] name = "run-examples" -version = "0.13.0" +version = "0.14.0" dependencies = [ "cc", ] @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "test-programs" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cfg-if", @@ -2229,7 +2229,7 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi-common" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cfg-if", @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "wasmtime" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "backtrace", @@ -2292,7 +2292,7 @@ dependencies = [ [[package]] name = "wasmtime-c-api" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "wasi-common", @@ -2303,7 +2303,7 @@ dependencies = [ [[package]] name = "wasmtime-cli" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "faerie", @@ -2331,7 +2331,7 @@ dependencies = [ [[package]] name = "wasmtime-debug" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "faerie", @@ -2345,7 +2345,7 @@ dependencies = [ [[package]] name = "wasmtime-environ" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "base64 0.12.0", @@ -2392,7 +2392,7 @@ dependencies = [ [[package]] name = "wasmtime-fuzzing" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "arbitrary", @@ -2408,7 +2408,7 @@ dependencies = [ [[package]] name = "wasmtime-jit" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cfg-if", @@ -2432,7 +2432,7 @@ dependencies = [ [[package]] name = "wasmtime-obj" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "faerie", @@ -2442,7 +2442,7 @@ dependencies = [ [[package]] name = "wasmtime-profiling" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "cfg-if", @@ -2459,7 +2459,7 @@ dependencies = [ [[package]] name = "wasmtime-py" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "pyo3", @@ -2472,7 +2472,7 @@ dependencies = [ [[package]] name = "wasmtime-runtime" -version = "0.13.0" +version = "0.14.0" dependencies = [ "backtrace", "cc", @@ -2489,7 +2489,7 @@ dependencies = [ [[package]] name = "wasmtime-rust" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "wasmtime", @@ -2499,7 +2499,7 @@ dependencies = [ [[package]] name = "wasmtime-rust-macro" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proc-macro2", "quote", @@ -2508,7 +2508,7 @@ dependencies = [ [[package]] name = "wasmtime-wasi" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "log", @@ -2521,7 +2521,7 @@ dependencies = [ [[package]] name = "wasmtime-wast" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "wasmtime", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "wig" -version = "0.13.0" +version = "0.14.0" dependencies = [ "heck", "proc-macro2", @@ -2567,7 +2567,7 @@ dependencies = [ [[package]] name = "wiggle" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proptest", "thiserror", @@ -2578,7 +2578,7 @@ dependencies = [ [[package]] name = "wiggle-generate" -version = "0.13.0" +version = "0.14.0" dependencies = [ "anyhow", "heck", @@ -2590,7 +2590,7 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "0.13.0" +version = "0.14.0" dependencies = [ "syn", "wiggle", @@ -2600,7 +2600,7 @@ dependencies = [ [[package]] name = "wiggle-test" -version = "0.13.0" +version = "0.14.0" dependencies = [ "proptest", "wiggle", @@ -2639,7 +2639,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winx" -version = "0.13.0" +version = "0.14.0" dependencies = [ "bitflags", "cvt", @@ -2661,7 +2661,7 @@ dependencies = [ [[package]] name = "yanix" -version = "0.13.0" +version = "0.14.0" dependencies = [ "bitflags", "cfg-if", diff --git a/Cargo.toml b/Cargo.toml index e9266c922b..b0f85dc544 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-cli" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Command-line interface for Wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -22,14 +22,14 @@ doc = false [dependencies] # Enable all supported architectures by default. -wasmtime = { path = "crates/api", version = "0.13.0", default-features = false } -wasmtime-debug = { path = "crates/debug", version = "0.13.0" } -wasmtime-environ = { path = "crates/environ", version = "0.13.0" } -wasmtime-jit = { path = "crates/jit", version = "0.13.0" } -wasmtime-obj = { path = "crates/obj", version = "0.13.0" } -wasmtime-wast = { path = "crates/wast", version = "0.13.0" } -wasmtime-wasi = { path = "crates/wasi", version = "0.13.0" } -wasi-common = { path = "crates/wasi-common", version = "0.13.0" } +wasmtime = { path = "crates/api", version = "0.14.0", default-features = false } +wasmtime-debug = { path = "crates/debug", version = "0.14.0" } +wasmtime-environ = { path = "crates/environ", version = "0.14.0" } +wasmtime-jit = { path = "crates/jit", version = "0.14.0" } +wasmtime-obj = { path = "crates/obj", version = "0.14.0" } +wasmtime-wast = { path = "crates/wast", version = "0.14.0" } +wasmtime-wasi = { path = "crates/wasi", version = "0.14.0" } +wasi-common = { path = "crates/wasi-common", version = "0.14.0" } structopt = { version = "0.3.5", features = ["color", "suggestions"] } faerie = "0.15.0" anyhow = "1.0.19" @@ -41,7 +41,7 @@ libc = "0.2.60" rayon = "1.2.1" [dev-dependencies] -wasmtime-runtime = { path = "crates/runtime", version = "0.13.0" } +wasmtime-runtime = { path = "crates/runtime", version = "0.14.0" } more-asserts = "0.2.1" test-programs = { path = "crates/test-programs" } tempfile = "3.1.0" diff --git a/RELEASES.md b/RELEASES.md index 6af5a16841..7dda49ed5a 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -2,9 +2,17 @@ -------------------------------------------------------------------------------- +## 0.15.0 + +Unreleased + +-------------------------------------------------------------------------------- + ## 0.14.0 -Unreleased +### Fixed + +Fix build errors in wasi-common on Windows. -------------------------------------------------------------------------------- diff --git a/crates/api/Cargo.toml b/crates/api/Cargo.toml index 69b3946240..d43d582da1 100644 --- a/crates/api/Cargo.toml +++ b/crates/api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "High-level API to expose the Wasmtime runtime" documentation = "https://docs.rs/wasmtime" @@ -10,10 +10,10 @@ readme = "README.md" edition = "2018" [dependencies] -wasmtime-runtime = { path = "../runtime", version = "0.13.0" } -wasmtime-environ = { path = "../environ", version = "0.13.0" } -wasmtime-jit = { path = "../jit", version = "0.13.0" } -wasmtime-profiling = { path = "../profiling", version = "0.13.0" } +wasmtime-runtime = { path = "../runtime", version = "0.14.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } +wasmtime-jit = { path = "../jit", version = "0.14.0" } +wasmtime-profiling = { path = "../profiling", version = "0.14.0" } wasmparser = "0.51.2" target-lexicon = { version = "0.10.0", default-features = false } anyhow = "1.0.19" @@ -30,7 +30,7 @@ winapi = "0.3.7" [dev-dependencies] # for wasmtime.rs -wasi-common = { path = "../wasi-common", version = "0.13.0" } +wasi-common = { path = "../wasi-common", version = "0.14.0" } pretty_env_logger = "0.4.0" rayon = "1.2.1" file-per-thread-logger = "0.1.1" diff --git a/crates/c-api/Cargo.toml b/crates/c-api/Cargo.toml index b3e53d7963..4913f985e4 100644 --- a/crates/c-api/Cargo.toml +++ b/crates/c-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-c-api" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "C API to expose the Wasmtime runtime" license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/debug/Cargo.toml b/crates/debug/Cargo.toml index c8dc2857f0..8bd1661c45 100644 --- a/crates/debug/Cargo.toml +++ b/crates/debug/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-debug" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Debug utils for WebAsssembly code in Cranelift" license = "Apache-2.0 WITH LLVM-exception" @@ -15,7 +15,7 @@ edition = "2018" gimli = "0.20.0" wasmparser = "0.51.2" faerie = "0.15.0" -wasmtime-environ = { path = "../environ", version = "0.13.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } target-lexicon = { version = "0.10.0", default-features = false } anyhow = "1.0" thiserror = "1.0.4" diff --git a/crates/environ/Cargo.toml b/crates/environ/Cargo.toml index c88cce006c..053e761fb3 100644 --- a/crates/environ/Cargo.toml +++ b/crates/environ/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-environ" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Standalone environment support for WebAsssembly code in Cranelift" license = "Apache-2.0 WITH LLVM-exception" @@ -17,7 +17,7 @@ cranelift-codegen = { path = "../../cranelift/codegen", version = "0.61.0", feat cranelift-entity = { path = "../../cranelift/entity", version = "0.61.0", features = ["enable-serde"] } cranelift-wasm = { path = "../../cranelift/wasm", version = "0.61.0", features = ["enable-serde"] } wasmparser = "0.51.2" -lightbeam = { path = "../lightbeam", optional = true, version = "0.13.0" } +lightbeam = { path = "../lightbeam", optional = true, version = "0.14.0" } indexmap = "1.0.2" rayon = "1.2.1" thiserror = "1.0.4" diff --git a/crates/fuzzing/Cargo.toml b/crates/fuzzing/Cargo.toml index b0fbf5f66c..1a1e51c96c 100644 --- a/crates/fuzzing/Cargo.toml +++ b/crates/fuzzing/Cargo.toml @@ -4,7 +4,7 @@ description = "Fuzzing infrastructure for Wasmtime" edition = "2018" name = "wasmtime-fuzzing" publish = false -version = "0.13.0" +version = "0.14.0" [dependencies] anyhow = "1.0.22" @@ -15,7 +15,7 @@ log = "0.4.8" rayon = "1.2.1" wasmparser = "0.51.2" wasmprinter = "0.2.1" -wasmtime = { path = "../api", version = "0.13.0" } +wasmtime = { path = "../api", version = "0.14.0" } [dev-dependencies] wat = "1.0.10" diff --git a/crates/jit/Cargo.toml b/crates/jit/Cargo.toml index 8dfd207511..220d39e01d 100644 --- a/crates/jit/Cargo.toml +++ b/crates/jit/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-jit" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "JIT-style execution for WebAsssembly code in Cranelift" documentation = "https://docs.rs/wasmtime-jit" @@ -17,10 +17,10 @@ cranelift-entity = { path = "../../cranelift/entity", version = "0.61.0", featur cranelift-wasm = { path = "../../cranelift/wasm", version = "0.61.0", features = ["enable-serde"] } cranelift-native = { path = "../../cranelift/native", version = "0.61.0" } cranelift-frontend = { path = "../../cranelift/frontend", version = "0.61.0" } -wasmtime-environ = { path = "../environ", version = "0.13.0" } -wasmtime-runtime = { path = "../runtime", version = "0.13.0" } -wasmtime-debug = { path = "../debug", version = "0.13.0" } -wasmtime-profiling = { path = "../profiling", version = "0.13.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } +wasmtime-runtime = { path = "../runtime", version = "0.14.0" } +wasmtime-debug = { path = "../debug", version = "0.14.0" } +wasmtime-profiling = { path = "../profiling", version = "0.14.0" } region = "2.0.0" thiserror = "1.0.4" target-lexicon = { version = "0.10.0", default-features = false } diff --git a/crates/lightbeam/Cargo.toml b/crates/lightbeam/Cargo.toml index d06083142c..a7c3c7c693 100644 --- a/crates/lightbeam/Cargo.toml +++ b/crates/lightbeam/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lightbeam" -version = "0.13.0" +version = "0.14.0" authors = ["The Lightbeam Project Developers"] description = "An optimising one-pass streaming compiler for WebAssembly" license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/misc/py/Cargo.toml b/crates/misc/py/Cargo.toml index c991fff552..3c3ec4e7b5 100644 --- a/crates/misc/py/Cargo.toml +++ b/crates/misc/py/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-py" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Python extension for Wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -17,8 +17,8 @@ test = false doc = false [dependencies] -wasmtime = { path = "../../api", version = "0.13.0" } -wasmtime-wasi = { path = "../../wasi", version = "0.13.0" } +wasmtime = { path = "../../api", version = "0.14.0" } +wasmtime-wasi = { path = "../../wasi", version = "0.14.0" } target-lexicon = { version = "0.10.0", default-features = false } anyhow = "1.0.19" region = "2.0.0" diff --git a/crates/misc/run-examples/Cargo.toml b/crates/misc/run-examples/Cargo.toml index a11d77d10b..1d87292bca 100644 --- a/crates/misc/run-examples/Cargo.toml +++ b/crates/misc/run-examples/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "run-examples" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] edition = "2018" publish = false diff --git a/crates/misc/rust/Cargo.toml b/crates/misc/rust/Cargo.toml index 46b5d6de34..464575d9de 100644 --- a/crates/misc/rust/Cargo.toml +++ b/crates/misc/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-rust" -version = "0.13.0" +version = "0.14.0" authors = ["Alex Crichton "] description = "Rust extension for Wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -15,9 +15,9 @@ test = false doctest = false [dependencies] -wasmtime-rust-macro = { path = "./macro", version = "0.13.0" } -wasmtime-wasi = { path = "../../wasi", version = "0.13.0" } -wasmtime = { path = "../../api", version = "0.13.0" } +wasmtime-rust-macro = { path = "./macro", version = "0.14.0" } +wasmtime-wasi = { path = "../../wasi", version = "0.14.0" } +wasmtime = { path = "../../api", version = "0.14.0" } anyhow = "1.0.19" [badges] diff --git a/crates/misc/rust/macro/Cargo.toml b/crates/misc/rust/macro/Cargo.toml index b5832663a6..b5bd924e3e 100644 --- a/crates/misc/rust/macro/Cargo.toml +++ b/crates/misc/rust/macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-rust-macro" -version = "0.13.0" +version = "0.14.0" authors = ["Alex Crichton "] description = "Macro support crate for wasmtime-rust" license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/obj/Cargo.toml b/crates/obj/Cargo.toml index 979b42a7cf..3a7a6247c6 100644 --- a/crates/obj/Cargo.toml +++ b/crates/obj/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-obj" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Native object file output for WebAsssembly code in Wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0" -wasmtime-environ = { path = "../environ", version = "0.13.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } faerie = "0.15.0" more-asserts = "0.2.1" diff --git a/crates/profiling/Cargo.toml b/crates/profiling/Cargo.toml index 33fda5c13f..c803c402dc 100644 --- a/crates/profiling/Cargo.toml +++ b/crates/profiling/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-profiling" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Runtime library support for Wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -20,8 +20,8 @@ object = { version = "0.18.0", optional = true } scroll = { version = "0.10.1", optional = true } serde = { version = "1.0.99", features = ["derive"] } target-lexicon = "0.10.0" -wasmtime-environ = { path = "../environ", version = "0.13.0" } -wasmtime-runtime = { path = "../runtime", version = "0.13.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } +wasmtime-runtime = { path = "../runtime", version = "0.14.0" } [badges] maintenance = { status = "actively-developed" } diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 02e512a54b..a88e795e63 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-runtime" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Runtime library support for Wasmtime" documentation = "https://docs.rs/wasmtime-runtime" @@ -12,7 +12,7 @@ readme = "README.md" edition = "2018" [dependencies] -wasmtime-environ = { path = "../environ", version = "0.13.0" } +wasmtime-environ = { path = "../environ", version = "0.14.0" } region = "2.0.0" libc = { version = "0.2.60", default-features = false } memoffset = "0.5.3" diff --git a/crates/test-programs/Cargo.toml b/crates/test-programs/Cargo.toml index 38c0f08f52..27b0eceac7 100644 --- a/crates/test-programs/Cargo.toml +++ b/crates/test-programs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "test-programs" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] readme = "README.md" edition = "2018" @@ -10,9 +10,9 @@ publish = false cfg-if = "0.1.9" [dev-dependencies] -wasi-common = { path = "../wasi-common", version = "0.13.0" } -wasmtime-wasi = { path = "../wasi", version = "0.13.0" } -wasmtime = { path = "../api", version = "0.13.0" } +wasi-common = { path = "../wasi-common", version = "0.14.0" } +wasmtime-wasi = { path = "../wasi", version = "0.14.0" } +wasmtime = { path = "../api", version = "0.14.0" } target-lexicon = "0.10.0" pretty_env_logger = "0.4.0" tempfile = "3.1.0" diff --git a/crates/test-programs/wasi-tests/Cargo.lock b/crates/test-programs/wasi-tests/Cargo.lock index 158469ee3b..b30c712cf3 100644 --- a/crates/test-programs/wasi-tests/Cargo.lock +++ b/crates/test-programs/wasi-tests/Cargo.lock @@ -17,7 +17,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "wasi-tests" -version = "0.13.0" +version = "0.14.0" dependencies = [ "libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)", "more-asserts 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/crates/test-programs/wasi-tests/Cargo.toml b/crates/test-programs/wasi-tests/Cargo.toml index 667e87e9e4..d706c3999c 100644 --- a/crates/test-programs/wasi-tests/Cargo.toml +++ b/crates/test-programs/wasi-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasi-tests" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] readme = "README.md" edition = "2018" diff --git a/crates/wasi-common/Cargo.toml b/crates/wasi-common/Cargo.toml index d3e9bcf642..5173face2a 100644 --- a/crates/wasi-common/Cargo.toml +++ b/crates/wasi-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasi-common" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "WASI implementation in Rust" license = "Apache-2.0 WITH LLVM-exception" @@ -21,14 +21,14 @@ log = "0.4" filetime = "0.2.7" lazy_static = "1.4.0" num = { version = "0.2.0", default-features = false } -wig = { path = "wig", version = "0.13.0" } -wiggle = { path = "../wiggle", default-features = false, version = "0.13.0" } +wig = { path = "wig", version = "0.14.0" } +wiggle = { path = "../wiggle", default-features = false, version = "0.14.0" } [target.'cfg(unix)'.dependencies] -yanix = { path = "yanix", version = "0.13.0" } +yanix = { path = "yanix", version = "0.14.0" } [target.'cfg(windows)'.dependencies] -winx = { path = "winx", version = "0.13.0" } +winx = { path = "winx", version = "0.14.0" } winapi = "0.3" cpu-time = "1.0" diff --git a/crates/wasi-common/wig/Cargo.toml b/crates/wasi-common/wig/Cargo.toml index 1c5f4a502c..3f525ba9b0 100644 --- a/crates/wasi-common/wig/Cargo.toml +++ b/crates/wasi-common/wig/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wig" -version = "0.13.0" +version = "0.14.0" authors = ["Dan Gohman "] description = "WebAssembly Interface Generator" license = "Apache-2.0 WITH LLVM-exception" diff --git a/crates/wasi-common/winx/Cargo.toml b/crates/wasi-common/winx/Cargo.toml index 56d36ba045..681d8dba89 100644 --- a/crates/wasi-common/winx/Cargo.toml +++ b/crates/wasi-common/winx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "winx" -version = "0.13.0" +version = "0.14.0" authors = ["Jakub Konka "] description = "Windows API helper library" documentation = "https://docs.rs/winx" diff --git a/crates/wasi-common/yanix/Cargo.toml b/crates/wasi-common/yanix/Cargo.toml index 5e1b1d6e5d..60ba8ebad4 100644 --- a/crates/wasi-common/yanix/Cargo.toml +++ b/crates/wasi-common/yanix/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "yanix" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "Yet Another Nix crate: a Unix API helper library" documentation = "https://docs.rs/yanix" diff --git a/crates/wasi/Cargo.toml b/crates/wasi/Cargo.toml index 28846fa519..6ca7cb4674 100644 --- a/crates/wasi/Cargo.toml +++ b/crates/wasi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-wasi" -version = "0.13.0" +version = "0.14.0" authors = ["The Cranelift Project Developers"] description = "WASI API support for Wasmtime" documentation = "https://docs.rs/wasmtime-wasi" @@ -14,11 +14,11 @@ edition = "2018" [dependencies] anyhow = "1.0" log = { version = "0.4.8", default-features = false } -wasi-common = { path = "../wasi-common", version = "0.13.0" } -wasmtime = { path = "../api", version = "0.13.0", default-features = false } -wasmtime-runtime = { path = "../runtime", version = "0.13.0" } -wig = { path = "../wasi-common/wig", version = "0.13.0" } -wiggle = { path = "../wiggle", version = "0.13.0" } +wasi-common = { path = "../wasi-common", version = "0.14.0" } +wasmtime = { path = "../api", version = "0.14.0", default-features = false } +wasmtime-runtime = { path = "../runtime", version = "0.14.0" } +wig = { path = "../wasi-common/wig", version = "0.14.0" } +wiggle = { path = "../wiggle", version = "0.14.0" } [badges] maintenance = { status = "actively-developed" } diff --git a/crates/wast/Cargo.toml b/crates/wast/Cargo.toml index 4053dd79e4..9a911cb9cf 100644 --- a/crates/wast/Cargo.toml +++ b/crates/wast/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wasmtime-wast" -version = "0.13.0" +version = "0.14.0" authors = ["The Wasmtime Project Developers"] description = "wast testing support for wasmtime" license = "Apache-2.0 WITH LLVM-exception" @@ -12,7 +12,7 @@ edition = "2018" [dependencies] anyhow = "1.0.19" -wasmtime = { path = "../api", version = "0.13.0", default-features = false } +wasmtime = { path = "../api", version = "0.14.0", default-features = false } wast = "11.0.0" [badges] diff --git a/crates/wiggle/Cargo.toml b/crates/wiggle/Cargo.toml index 0633c07fd0..0da1c940c6 100644 --- a/crates/wiggle/Cargo.toml +++ b/crates/wiggle/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wiggle" -version = "0.13.0" +version = "0.14.0" authors = ["Pat Hickey ", "Jakub Konka ", "Alex Crichton "] edition = "2018" license = "Apache-2.0 WITH LLVM-exception" @@ -13,13 +13,13 @@ include = ["src/**/*", "LICENSE"] [dependencies] thiserror = "1" witx = { path = "../wasi-common/wig/WASI/tools/witx", version = "0.8.4", optional = true } -wiggle-macro = { path = "macro", version = "0.13.0" } +wiggle-macro = { path = "macro", version = "0.14.0" } [badges] maintenance = { status = "actively-developed" } [dev-dependencies] -wiggle-test = { path = "test-helpers", version = "0.13.0" } +wiggle-test = { path = "test-helpers", version = "0.14.0" } proptest = "0.9" [features] diff --git a/crates/wiggle/generate/Cargo.toml b/crates/wiggle/generate/Cargo.toml index 2be70669b0..7d8af8bec2 100644 --- a/crates/wiggle/generate/Cargo.toml +++ b/crates/wiggle/generate/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wiggle-generate" -version = "0.13.0" +version = "0.14.0" authors = ["Pat Hickey ", "Jakub Konka ", "Alex Crichton "] license = "Apache-2.0 WITH LLVM-exception" edition = "2018" diff --git a/crates/wiggle/macro/Cargo.toml b/crates/wiggle/macro/Cargo.toml index fb69d003cc..411fb3b9dc 100644 --- a/crates/wiggle/macro/Cargo.toml +++ b/crates/wiggle/macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wiggle-macro" -version = "0.13.0" +version = "0.14.0" authors = ["Pat Hickey ", "Jakub Konka ", "Alex Crichton "] edition = "2018" license = "Apache-2.0 WITH LLVM-exception" @@ -15,7 +15,7 @@ include = ["src/**/*", "LICENSE"] proc-macro = true [dependencies] -wiggle-generate = { path = "../generate", version = "0.13.0" } +wiggle-generate = { path = "../generate", version = "0.14.0" } witx = { path = "../../wasi-common/wig/WASI/tools/witx", version = "0.8.4" } syn = { version = "1.0", features = ["full"] } diff --git a/crates/wiggle/test-helpers/Cargo.toml b/crates/wiggle/test-helpers/Cargo.toml index bba0892b6d..e70d43a104 100644 --- a/crates/wiggle/test-helpers/Cargo.toml +++ b/crates/wiggle/test-helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "wiggle-test" -version = "0.13.0" +version = "0.14.0" authors = ["Pat Hickey ", "Jakub Konka ", "Alex Crichton "] license = "Apache-2.0 WITH LLVM-exception" edition = "2018" @@ -12,7 +12,7 @@ include = ["src/**/*", "LICENSE"] [dependencies] proptest = "0.9" -wiggle = { path = "..", version = "0.13.0" } +wiggle = { path = "..", version = "0.14.0" } [badges] maintenance = { status = "actively-developed" } diff --git a/scripts/bump-cranelift-version.sh b/scripts/bump-cranelift-version.sh index 2428b899e8..bf58fad81d 100755 --- a/scripts/bump-cranelift-version.sh +++ b/scripts/bump-cranelift-version.sh @@ -21,7 +21,11 @@ done # Update the required version numbers of path dependencies. find -name Cargo.toml \ + -not -path ./crates/wasi-common/WASI/tools/witx/Cargo.toml \ -not -path ./crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \ -exec sed -i.bk \ -e "/^cranelift/s/version = \"[^\"]*\"/version = \"$version\"/" \ {} \; + +# Update the Cargo.lock file for the new versions. +cargo update diff --git a/scripts/bump-wasmtime-version.sh b/scripts/bump-wasmtime-version.sh index eaa5b1bcb2..d8b17518fe 100755 --- a/scripts/bump-wasmtime-version.sh +++ b/scripts/bump-wasmtime-version.sh @@ -9,12 +9,13 @@ topdir=$(dirname "$0")/.. cd "$topdir" # All the wasmtime-* crates have the same version number -version="0.13.0" +version="0.14.0" # Update the version numbers of the crates to $version. Skip crates with # a version of "0.0.0", which are unpublished. echo "Updating crate versions to $version" find crates -name Cargo.toml \ + -not -path crates/wasi-common/WASI/tools/witx/Cargo.toml \ -not -path crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \ -exec sed -i.bk -e "s/^version = \"[.*[^0.].*\"$/version = \"$version\"/" {} \; @@ -23,12 +24,20 @@ sed -i.bk -e "s/^version = \"[.*[^0.].*\"$/version = \"$version\"/" Cargo.toml # Update the required version numbers of path dependencies. find -name Cargo.toml \ + -not -path ./crates/wasi-common/WASI/tools/witx/Cargo.toml \ -not -path ./crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \ -exec sed -i.bk \ -e "/^\(wasmtime\|wiggle\)/s/version = \"[^\"]*\"/version = \"$version\"/" \ {} \; find -name Cargo.toml \ + -not -path ./crates/wasi-common/WASI/tools/witx/Cargo.toml \ -not -path ./crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \ -exec sed -i.bk \ - -e "/^\(wasi-common\|wig\|yanix\|winx\) = /s/version = \"[^\"]*\"/version = \"$version\"/" \ + -e "/^\(wasi-common\|wig\|yanix\|winx\|lightbeam\) = /s/version = \"[^\"]*\"/version = \"$version\"/" \ {} \; + +# Update the Cargo.lock files for the new versions. +cargo update +cd crates/test-programs/wasi-tests +cargo update +cd - >/dev/null diff --git a/scripts/publish-wasmtime.sh b/scripts/publish-wasmtime.sh index 6b9de573a8..7527e162c9 100755 --- a/scripts/publish-wasmtime.sh +++ b/scripts/publish-wasmtime.sh @@ -21,9 +21,9 @@ for cargo_toml in \ crates/wasi-common/winx/Cargo.toml \ crates/wasi-common/yanix/Cargo.toml \ crates/wasi-common/wig/Cargo.toml \ - crates/wiggle/crates/runtime/Cargo.toml \ - crates/wiggle/crates/generate/Cargo.toml \ - crates/wiggle/crates/test/Cargo.toml \ + crates/wiggle/generate/Cargo.toml \ + crates/wiggle/test/Cargo.toml \ + crates/wiggle/macro/Cargo.toml \ crates/wiggle/Cargo.toml \ crates/wasi-common/Cargo.toml \ crates/lightbeam/Cargo.toml \