use wasi annotation for cwd

wasmerio · Sep 4, 2024 · 3fbffbb · 3fbffbb
1 parent 766eb17
commit 3fbffbb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 25 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -92,7 +92,7 @@ wasmer-config = { path = "./lib/config" }
 wasmer-wasix = { path = "./lib/wasix" }
 
 # Wasmer-owned crates
-webc = { version = "6.0.0-rc1", default-features = false, features = ["package"] }
+webc = { version = "6.0.0-rc3", default-features = false, features = ["package"] }
 edge-schema = { version = "=0.1.0" }
 shared-buffer = "0.1.4"
 

diff --git a/lib/wasix/src/runners/wasi.rs b/lib/wasix/src/runners/wasi.rs
@@ -353,8 +353,8 @@ impl crate::runners::Runner for WasiRunner {
             }
         }
 
-        if let Some(cwd) = cmd.metadata().annotation::<String>("cwd")? {
-            env.set_current_dir(PathBuf::from(cwd));
+        if let Some(cwd) = &wasi.cwd {
+            env.set_current_dir(cwd);
         }
 
         let env = env.build()?;

diff --git a/tests/integration/cli/tests/packages/list-cwd/wasmer.toml b/tests/integration/cli/tests/packages/list-cwd/wasmer.toml
@@ -10,5 +10,5 @@ name = "run"
 module = "main"
 runner = "wasi"
 
-[command.annotations]
+[command.annotations.wasi]
 cwd = "/data"