Skip to content

Commit f08b400

Browse files
authored
rename wasm_runtime -> hyperlight-wasm-runtime (#411)
Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>
1 parent 28f7f92 commit f08b400

29 files changed

Lines changed: 90 additions & 114 deletions

.github/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ updates:
2121
update-types: ["version-update:semver-minor", "version-update:semver-major"]
2222
# Add entries for excluded workspace members
2323
- package-ecosystem: "cargo"
24-
directory: "/src/wasm_runtime"
24+
directory: "/src/hyperlight_wasm_runtime"
2525
schedule:
2626
interval: "daily"
2727
time: "03:00"

.github/workflows/CreateRelease.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,6 @@ jobs:
3939
uses: hyperlight-dev/ci-setup-workflow@v1.8.0
4040
with:
4141
rust-toolchain: "1.89"
42-
- name: Verify vendor.tar
43-
if: ${{ contains(github.ref, 'refs/heads/release/') }}
44-
run: |
45-
set -euxo pipefail
46-
VENDOR1=$(mktemp -d)
47-
VENDOR2=$(mktemp -d)
48-
tar xf ./src/hyperlight_wasm/vendor.tar -C $VENDOR1
49-
just make-vendor-tar
50-
tar xf ./src/hyperlight_wasm/vendor.tar -C $VENDOR2
51-
if ! git diff --no-index $VENDOR1 $VENDOR2; then
52-
echo "vendor.tar is not up to date, please run 'just make-vendor-tar' and commit the changes"
53-
exit 1
54-
fi
55-
git restore ./src/hyperlight_wasm/vendor.tar
56-
shell: bash
5742
- name: Package hyperlight-wasm crate
5843
if: ${{ contains(github.ref, 'refs/heads/release/') }}
5944
run: cargo package -p hyperlight-wasm

.github/workflows/CreateReleaseBranch.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,5 @@ jobs:
2424
- name: Create Release Branch
2525
run: |
2626
git checkout -b release/${GITHUB_REF_NAME}
27-
just make-vendor-tar
28-
sed -i '/vendor.tar/d' ./src/hyperlight_wasm/.gitignore
29-
git add ./src/hyperlight_wasm/vendor.tar
30-
git add ./src/hyperlight_wasm/.gitignore
31-
git config user.name hyperlight-wasm-ci
32-
git config user.email github@users.noreply.github.com
33-
git commit -s \
34-
-m "Vendor dependencies for release ${GITHUB_REF_NAME}"
3527
git push --set-upstream origin release/${GITHUB_REF_NAME}
3628
shell: bash

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,8 +463,6 @@ $RECYCLE.BIN/
463463
**/include/libc/musl/**
464464
**/include/flatbuffers/generated/**
465465
**/include/flatcc/**
466-
**/guest-toolchain
467-
src/wasm_runtime/src/include
468466

469467
## Rust from https://github.com/github/gitignore/blob/main/Rust.gitignore
470468

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{
44
"id": "program",
55
"type": "promptString",
6-
"default": "x64/debug/wasm_runtime",
6+
"default": "x64/debug/hyperlight_wasm_runtime",
77
"description": "Path to the program to debug",
88
}
99
],

Cargo.lock

Lines changed: 19 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = [ "src/hyperlight_wasm", "src/examples_common", "src/hyperlight_wasm_aot", "src/wasm_runtime", "src/hyperlight_wasm_macro" ]
2+
members = [ "src/hyperlight_wasm", "src/examples_common", "src/hyperlight_wasm_aot", "src/hyperlight_wasm_runtime", "src/hyperlight_wasm_macro" ]
33
exclude = [ "src/rust_wasm_samples", "src/component_sample" ]
44
resolver = "2"
55

@@ -20,4 +20,4 @@ hyperlight-guest = { version = "0.12.0" }
2020
hyperlight-guest-bin = { version = "0.12.0", features = [ "printf" ] }
2121
hyperlight-host = { version = "0.12.0", default-features = false, features = ["executable_heap", "init-paging"] }
2222
hyperlight-wasm-macro = { version = "0.12.0", path = "src/hyperlight_wasm_macro" }
23-
wasm-runtime = { version = "0.12.0", path = "src/wasm_runtime" }
23+
hyperlight-wasm-runtime = { version = "0.12.0", path = "src/hyperlight_wasm_runtime" }

Justfile

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,6 @@ wit-world-c := if os() == "windows" { "$env:WIT_WORLD=\"" + justfile_directory()
88

99
set windows-shell := ["pwsh.exe", "-NoLogo", "-Command"]
1010

11-
make-vendor-tar:
12-
tar cf ./src/hyperlight_wasm/vendor.tar \
13-
--owner=0 --group=0 \
14-
--exclude-vcs-ignores \
15-
-C ./src wasm_runtime hyperlight_wasm_macro
16-
1711
ensure-tools:
1812
cargo install wasm-tools --locked --version 1.235.0
1913
cargo install cargo-component --locked --version 0.21.1
@@ -66,32 +60,29 @@ check target=default-target:
6660
cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
6761
cd src/rust_wasm_samples && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
6862
cd src/component_sample && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
69-
cd src/wasm_runtime && cargo hyperlight check --profile={{ if target == "debug" {"dev"} else { target } }}
63+
cd src/hyperlight_wasm_runtime && cargo hyperlight check --profile={{ if target == "debug" {"dev"} else { target } }}
7064
cd src/hyperlight_wasm_macro && cargo check --profile={{ if target == "debug" {"dev"} else { target } }}
7165

7266
fmt-check:
7367
rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
7468
cd src/rust_wasm_samples && rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
7569
cd src/component_sample && rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
76-
cd src/wasm_runtime && rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
70+
cd src/hyperlight_wasm_runtime && rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
7771
cd src/hyperlight_wasm_macro && rustup toolchain install nightly -c rustfmt && cargo +nightly fmt -v --all -- --check
7872

7973
fmt:
8074
rustup toolchain install nightly -c rustfmt
8175
cargo +nightly fmt --all
8276
cd src/rust_wasm_samples && cargo +nightly fmt -v --all
8377
cd src/component_sample && cargo +nightly fmt -v --all
84-
cd src/wasm_runtime && cargo +nightly fmt -v --all
78+
cd src/hyperlight_wasm_runtime && cargo +nightly fmt -v --all
8579
cd src/hyperlight_wasm_macro && cargo +nightly fmt -v --all
8680

87-
export CC_x86_64_unknown_none:= if os() == "windows" { justfile_directory() / "src/wasm_runtime/guest-toolchain/clang" } else { "" }
88-
export AR_x86_64_unknown_none:= if os() == "windows" { "llvm-ar" } else { "" }
89-
9081
clippy target=default-target: (check target)
9182
cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
9283
cd src/rust_wasm_samples && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
9384
cd src/component_sample && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
94-
cd src/wasm_runtime && cargo hyperlight clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
85+
cd src/hyperlight_wasm_runtime && cargo hyperlight clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
9586
cd src/hyperlight_wasm_macro && cargo clippy --profile={{ if target == "debug" {"dev"} else { target } }} --all-targets --all-features -- -D warnings
9687

9788
# TESTING

RustDev.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ but has no Wasm runtime loaded. Once it has been transitioned to a `WasmSandbox`
4141

4242
### More about `WasmSandbox`
4343

44-
The `WasmSandbox` represents a sandbox state that is not completely ready for use. While it does have the `wasm_runtime` guest binary loaded into it (see [Rust.md](./Rust.md) for more details on this guest binary), and the Wasm runtime initialised, it is missing a user's WebAssembly module code. The 'WasmSandbox' type is an intermediate state that is designed to be cached in a host to avoid having to pay the cost of loading the `wasm_runtime` guest binary and initializing the Wasm runtime each time a new user code module is loaded.
44+
The `WasmSandbox` represents a sandbox state that is not completely ready for use. While it does have the `hyperlight-wasm-runtime` guest binary loaded into it (see [Rust.md](./Rust.md) for more details on this guest binary), and the Wasm runtime initialised, it is missing a user's WebAssembly module code. The 'WasmSandbox' type is an intermediate state that is designed to be cached in a host to avoid having to pay the cost of loading the `hyperlight-wasm-runtime` guest binary and initializing the Wasm runtime each time a new user code module is loaded.
4545

4646
Loading user code is the final initialization step necessary to have a ready-to-use sandbox, so moving from the `WasmSandbox` state to the `LoadedWasmSandbox` state requires specifying what user code to load. See the "State transitions" section below for details on making this state transition.
4747

docs/wasm-modules-debugging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ After you attach, you can set breakpoints, step through the code, and inspect va
3939
{
4040
"id": "program",
4141
"type": "promptString",
42-
"default": "x64/debug/wasm_runtime",
42+
"default": "x64/debug/hyperlight_wasm_runtime",
4343
"description": "Path to the program to debug"
4444
},
4545
],

0 commit comments

Comments
 (0)