Update to use the new hyperlight cargo lib

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

.github/workflows/Benchmarks.yml

@@ -38,12 +38,6 @@ jobs:
       with:
         rust-toolchain: "1.89"
 
-    - name: Build Wasm Runtime Binary
-      working-directory: ./src/hyperlight_wasm
-      run: |
-        just ensure-tools
-        just build-wasm-runtime ${{ matrix.config }}
-
     - uses: dtolnay/[email protected]
       with:
         components: clippy, rustfmt

.github/workflows/dep_rust.yml

@@ -67,12 +67,6 @@ jobs:
         if: runner.os == 'Windows'
         run: rustup component add --toolchain nightly-x86_64-pc-windows-msvc rustfmt
 
-      - name: Build Wasm Runtime Binary
-        working-directory: ./src/hyperlight_wasm
-        run: |
-          just ensure-tools
-          just build-wasm-runtime ${{ matrix.config }}
-
       - name: Download Wasm Modules
         uses: actions/download-artifact@v5
         with:
@@ -83,6 +77,7 @@ jobs:
         run:  |
           # this must be build before the formatting and other jobs run
           # because the component model example depends on the wasm component built here
+          just ensure-tools
           just compile-wit
           just build-rust-component-examples ${{ matrix.config }}
       

Cargo.lock

@@ -20,7 +20,7 @@ ensure-tools:
     cargo install wit-bindgen-cli --locked --version 0.43.0
     cargo install cargo-hyperlight --locked --version 0.1.4
 
-build-all target=default-target features="": (build target features) (build-examples target features) (build-wasm-runtime target features)
+build-all target=default-target features="": (build target features) (build-examples target features) 
 
 build target=default-target features="": (fmt-check)
     cargo build {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F " + features } }} --verbose --profile={{ if target == "debug" {"dev"} else { target } }}
@@ -33,9 +33,6 @@ compile-wit:
     wasm-tools component wit ./src/wasmsamples/components/runcomponent.wit -w -o ./src/wasmsamples/components/runcomponent-world.wasm
     wasm-tools component wit ./src/component_sample/wit/example.wit -w -o ./src/component_sample/wit/component-world.wasm
 
-build-wasm-runtime target=default-target features="":
-    cd ./src/wasm_runtime && cargo hyperlight build --verbose {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--features " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} && rm -R target
-
 build-examples target=default-target features="": (build-wasm-examples target features) (build-rust-wasm-examples target features) (build-rust-component-examples target features)
 
 build-wasm-examples target=default-target features="": (compile-wit) 

Justfile

@@ -101,6 +101,7 @@ built = { version = "0.8.0", features = ["chrono", "git2"] }
 anyhow = { version = "1.0" }
 goblin = "0.10.4"
 tar = "0.4.44"
+cargo-hyperlight = "0.1.4"
 
 [target.'cfg(windows)'.build-dependencies]
 junction = "1"

src/hyperlight_wasm/Cargo.toml

@@ -90,7 +90,6 @@ fn get_wasm_runtime_path() -> PathBuf {
 }
 
 fn build_wasm_runtime() -> PathBuf {
-    let cargo_bin = env::var_os("CARGO").unwrap();
     let profile = env::var_os("PROFILE").unwrap();
     let out_dir = env::var_os("OUT_DIR").unwrap();
 
@@ -113,9 +112,8 @@ fn build_wasm_runtime() -> PathBuf {
     let mut env_vars = env::vars().collect::<Vec<_>>();
     env_vars.retain(|(key, _)| !key.starts_with("CARGO_"));
 
-    let mut cargo_cmd = std::process::Command::new(&cargo_bin);
+    let mut cargo_cmd = cargo_hyperlight::cargo().unwrap();
     let mut cmd = cargo_cmd
-        .arg("hyperlight")
         .arg("build")
         .arg("--target-dir")
         .arg(&target_dir)
@@ -136,12 +134,9 @@ fn build_wasm_runtime() -> PathBuf {
         cmd = cmd.arg("--features").arg("trace_guest");
     }
 
-    let status = cmd
-        .status()
+    cmd.status()
         .unwrap_or_else(|e| panic!("could not run cargo build wasm_runtime: {}", e));
-    if !status.success() {
-        panic!("could not compile wasm_runtime");
-    }
+
     let resource = target_dir
         .join("x86_64-hyperlight-none")
         .join(profile)