Remove unneeded just call now that they are consolidated

Signed-off-by: James Sturtevant <jsturtevant@gmail.com>

Author: jsturtevant

.github/dependabot.yml

@@ -32,7 +32,7 @@ updates:
       - dependency-name: "wasmtime"
         update-types: ["version-update:semver-minor", "version-update:semver-major"]
   - package-ecosystem: "cargo"
-    directory: "/src/rust_wasm_samples"
+    directory: "/src/tests/rust_guests/rust_wasm_samples"
     schedule:
       interval: "daily"
       time: "03:00"
@@ -48,7 +48,7 @@ updates:
     labels:
       - "kind/dependencies"
   - package-ecosystem: "cargo"
-    directory: "/src/component_sample"
+    directory: "/src/tests/rust_guests/component_sample"
     schedule:
       interval: "daily"
       time: "03:00"

.github/workflows/dep_build_wasm_examples.yml

@@ -66,8 +66,8 @@ jobs:
         # Only push if not from a fork, not from pull request, and not from dependabot
           uses: docker/build-push-action@v6
           with:
-            context: src/wasmsamples
-            file: src/wasmsamples/dockerfile
+            context: src/tests/c_guests/wasmsamples
+            file: src/tests/c_guests/wasmsamples/dockerfile
             load: true
             push: ${{ env.DO_PUSH }}
             build-args: |
@@ -81,7 +81,6 @@ jobs:
             just ensure-tools
             just build-wasm-examples release
           shell: bash
-          working-directory:  src/wasmsamples
         - name: Upload Wasm Modules
           uses: actions/upload-artifact@v4
           with:

.github/workflows/dep_rust.yml

@@ -120,10 +120,6 @@ jobs:
           # required for gh cli when downloading
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Test Component Model Examples
-        run: just examples-components ${{ matrix.config }}
-        working-directory: ./src/hyperlight_wasm
-      
       ### Benchmarks ###
 
       - name: Download benchmarks from "latest"

Justfile

@@ -5,6 +5,7 @@ mkdir-arg := if os() == "windows" { "-Force" } else { "-p" }
 latest-release:= if os() == "windows" {"$(git tag -l --sort=v:refname | select -last 2 | select -first 1)"} else {`git tag -l --sort=v:refname | tail -n 2 | head -n 1`}
 wit-world := if os() == "windows" { "$env:WIT_WORLD=\"" + justfile_directory() + "\\src\\tests\\rust_guests\\component_sample\\wit\\component-world.wasm" + "\";" } else { "WIT_WORLD=" + justfile_directory() + "/src/tests/rust_guests/component_sample/wit/component-world.wasm" }
 wit-world-c := if os() == "windows" { "$env:WIT_WORLD=\"" + justfile_directory() + "\\src\\tests\\c_guests\\wasmsamples\\components\\runcomponent-world.wasm" + "\";" } else { "WIT_WORLD=" + justfile_directory() + "/src/tests/c_guests/wasmsamples/components/runcomponent-world.wasm" }
+wit-world-name-greeter := if os() == "windows" { "$env:WIT_WORLD_NAME=\"greeter-world\";" } else { "WIT_WORLD_NAME=greeter-world" }
 
 set windows-shell := ["pwsh.exe", "-NoLogo", "-Command"]
 
@@ -122,7 +123,7 @@ examples-ci target=default-target features="": (examples-modules target features
 examples-components target=default-target features="": (build-rust-component-examples target) 
     {{ wit-world }} cargo run {{ if features =="" {''} else {"--no-default-features -F kvm -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example component_example
     {{ wit-world-c }} cargo run {{ if features =="" {''} else {"--no-default-features -F kvm -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example c-component
-    {{ wit-world }} WIT_WORLD_NAME=greeter-world cargo run {{ if features =="" {''} else {"--no-default-features -F kvm -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example component_greeter_example
+    {{ wit-world }} {{ wit-world-name-greeter }} cargo run {{ if features =="" {''} else {"--no-default-features -F kvm -F " + features } }} --profile={{ if target == "debug" {"dev"} else { target } }} --example component_greeter_example
 
 # Test a component and a module compiled with pulley
 examples-pulley target=default-target features="": (build-pulley-rust-component-examples target) (build-pulley-rust-wasm-examples target)

src/hyperlight_wasm/scripts/build-wasm-examples.bat

@@ -1,6 +1,6 @@
 @echo off
 pushd %~dp0\..\..\tests\c_guests\wasmsamples
-call :NORMALIZEPATH "..\..\x64\%1"
+call :NORMALIZEPATH "..\..\..\..\x64\%1"
 echo "%ABSPATH%"
 call compile-wasm.bat "." "%ABSPATH%"
 popd

src/hyperlight_wasm/scripts/build-wasm-examples.sh

@@ -5,7 +5,7 @@ set -o nounset
 set -o pipefail
 
 pushd "$(dirname "${BASH_SOURCE[0]}")/../../tests/c_guests/wasmsamples"
-OUTPUT_DIR="../../x64/${1:-"debug"}"
+OUTPUT_DIR="../../../../x64/${1:-"debug"}"
 BUILD_TYPE="${1:-"debug"}"
 FEATURES="${2:-""}"
 mkdir -p ${OUTPUT_DIR}

src/hyperlight_wasm_macro/src/lib.rs

@@ -48,5 +48,3 @@ pub fn wasm_guest_bindgen(_: proc_macro::TokenStream) -> proc_macro::TokenStream
         util::emit_decls(decls).into()
     })
 }
-
-