Revert jumping ahead to WASI 0.2 until it can be run successfully locally

brettcannon · brettcannon · commit bdd3952218a6 · 2024-03-01T15:01:05.000-08:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -6,7 +6,7 @@ ENV WASI_SDK_VERSION=20
 ENV WASI_SDK_PATH=/opt/wasi-sdk
 
 ENV WASMTIME_HOME=/opt/wasmtime
-ENV WASMTIME_VERSION=18.0.2
+ENV WASMTIME_VERSION=14.0.4
 ENV WASMTIME_CPU_ARCH=x86_64
 
 RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \
diff --git a/Tools/wasm/wasi.py b/Tools/wasm/wasi.py
@@ -277,23 +277,18 @@ def clean_contents(context):
 
 
 def main():
-    host_runner_parts = [
-        f"{shutil.which('wasmtime')} run",
-        # Make sure the stack size will work for a pydebug
-        # build.
-        # The 8388608 value comes from `ulimit -s` under Linux
-        # which equates to 8291 KiB.
-        "--wasm max-wasm-stack=8388608",
-        # Enable thread support.
-        #"--wasm threads=y --wasi threads=y "
-        # Use WASI 0.2 primitives
-        "--wasi preview2",
-        # Map the checkout to / to load the stdlib from /Lib.
-        "--dir {HOST_DIR}::{GUEST_DIR}",
-        # Set PYTHONPATH to the sysconfig data.
-        "--env {ENV_VAR_NAME}={ENV_VAR_VALUE}"
-    ]
-    default_host_runner = " ".join(host_runner_parts)
+    default_host_runner = (f"{shutil.which('wasmtime')} run "
+                        # Make sure the stack size will work for a pydebug
+                        # build.
+                        # The 8388608 value comes from `ulimit -s` under Linux
+                        # which equates to 8291 KiB.
+                        "--wasm max-wasm-stack=8388608 "
+                        # Enable thread support.
+                        "--wasm threads=y --wasi threads=y "
+                        # Map the checkout to / to load the stdlib from /Lib.
+                        "--dir {HOST_DIR}::{GUEST_DIR} "
+                        # Set PYTHONPATH to the sysconfig data.
+                        "--env {ENV_VAR_NAME}={ENV_VAR_VALUE}")
 
     parser = argparse.ArgumentParser()
     subcommands = parser.add_subparsers(dest="subcommand")
