Fix npm run on Windows

near · Feb 16, 2024 · 88288cd · 88288cd
1 parent 547d3a9
commit 88288cd
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -440,6 +440,10 @@ jobs:
         cache: 'npm'
         cache-dependency-path: tests/zkasm/package-lock.json
     - run: npm ci --prefix tests/zkasm
+    - run: node -v
+    - run: npm -v
+    - run: which node
+    - run: which npm
 
     # Install targets in order to build various tests throughout the repo
     - run: rustup target add wasm32-wasi wasm32-unknown-unknown ${{ matrix.target }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cranelift/filetests/Cargo.toml b/cranelift/filetests/Cargo.toml
@@ -47,3 +47,4 @@ regex = { workspace = true }
 wasmtime = { workspace = true, features = ["cranelift", "runtime"] }
 walkdir = { workspace = true }
 tempfile = { workspace = true }
+which = "6.0.0"
diff --git a/cranelift/filetests/src/zkasm_runner.rs b/cranelift/filetests/src/zkasm_runner.rs
@@ -74,7 +74,9 @@ pub fn run_zkasm_path(input_path: &Path) -> anyhow::Result<Vec<ExecutionResult>>
     )?;
 
     let mut output_file = NamedTempFile::new()?;
-    let output = std::process::Command::new("npm")
+    let npm_path = which::which("npm")?;
+    dbg!(npm_path);
+    let output = std::process::Command::new(npm_path)
         .args([
             "--prefix",
             "../../tests/zkasm",