Wasmtime 0.13.0 and Cranelift 0.61.0. (#1398)

This also updates the publishing scripts to work with newly added
and reorganized crates.

scripts/bump-cranelift-version.sh

@@ -9,16 +9,19 @@ topdir=$(dirname "$0")/..
 cd "$topdir"
 
 # All the cranelift-* crates have the same version number
-version="0.56"
+version="0.61.0"
 
 # Update all of the Cargo.toml files.
 echo "Updating crate versions to $version"
-for toml in Cargo.toml crates/*/Cargo.toml crates/misc/*/Cargo.toml fuzz/Cargo.toml; do
+for toml in cranelift/Cargo.toml cranelift/*/Cargo.toml cranelift/*/*/Cargo.toml; do
     # Update the version number of this crate to $version.
-    sed -i.bk -e "/^cranelift-/s/\"[^\"]*\"/\"$version\"/" \
-        "$toml"
-
-    # Update the required version number of any cranelift* dependencies.
-    sed -i.bk -e "/^cranelift-/s/version = \"[^\"]*\"/version = \"$version\"/" \
+    sed -i.bk -e "/^version = /s/\"[^\"]*\"/\"$version\"/" \
         "$toml"
 done
+
+# Update the required version numbers of path dependencies.
+find -name Cargo.toml \
+    -not -path ./crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \
+    -exec sed -i.bk \
+        -e "/^cranelift/s/version = \"[^\"]*\"/version = \"$version\"/" \
+        {} \;

scripts/bump-wasmtime-version.sh

@@ -9,19 +9,26 @@ topdir=$(dirname "$0")/..
 cd "$topdir"
 
 # All the wasmtime-* crates have the same version number
-version="0.12.0"
+version="0.13.0"
 
-# Update the version numbers of the crates to $version.
+# 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 -name Cargo.toml \
-    -not -path ./crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \
-    -exec sed -i.bk -e "s/^version = \"[[:digit:]].*/version = \"$version\"/" {} \;
+find crates -name Cargo.toml \
+    -not -path crates/wasi-common/wig/WASI/tools/witx/Cargo.toml \
+    -exec sed -i.bk -e "s/^version = \"[.*[^0.].*\"$/version = \"$version\"/" {} \;
+
+# Updat the top-level Cargo.toml too.
+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/wig/WASI/tools/witx/Cargo.toml \
     -exec sed -i.bk \
-        -e "/\> *= *{.*\<path *= *\"/s/version = \"[^\"]*\"/version = \"$version\"/" \
-        {} \;
-
-cargo build
+    -e "/^\(wasmtime\|wiggle\)/s/version = \"[^\"]*\"/version = \"$version\"/" \
+    {} \;
+find -name 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\"/" \
+    {} \;

scripts/publish-cranelift.sh

@@ -3,7 +3,7 @@ set -euo pipefail
 
 # This is a convenience script for maintainers publishing a new version of
 # Cranelift to crates.io. To use, first bump the version number by running the
-# `scripts/cranelift-version.sh` script, then run this script, and run the
+# `scripts/bump-cranelift-version.sh` script, then run this script, and run the
 # commands that it prints.
 #
 # Don't forget to push a git tag for this release!

scripts/publish-wasmtime.sh

@@ -35,6 +35,7 @@ for cargo_toml in \
     crates/misc/py/Cargo.toml \
     crates/misc/rust/macro/Cargo.toml \
     crates/misc/rust/Cargo.toml \
+    Cargo.toml \
 ; do
     version=""
     case $cargo_toml in