diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index 90ff253..8fcf8e1 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -94,19 +94,39 @@ jobs: if: ${{ contains(github.ref, 'refs/heads/release/') }} uses: rust-lang/crates-io-auth-action@v1 id: crates-io-auth + - name: Install cargo-overlay-registry + if: ${{ contains(github.ref, 'refs/heads/release/') }} + run: cargo install cargo-overlay-registry + shell: bash - name: Publish dry-run if: ${{ contains(github.ref, 'refs/heads/release/') }} run: | set -euxo pipefail - cargo publish -p hyperlight-wasm-aot --dry-run - cargo publish -p hyperlight-wasm --dry-run + rm -Rf ./target/package/tmp-registry + cargo overlay-registry \ + -r crates-io \ + -r local=./target/package/tmp-registry \ + -- \ + cargo +1.92 publish --dry-run \ + -p hyperlight-wasm-aot \ + -p hyperlight-wasm-macro \ + -p hyperlight-wasm-runtime \ + -p hyperlight-wasm shell: bash - name: Publish to crates.io if: ${{ contains(github.ref, 'refs/heads/release/') }} run: | set -euxo pipefail - cargo publish -p hyperlight-wasm-aot - cargo publish -p hyperlight-wasm + rm -Rf ./target/package/tmp-registry + cargo overlay-registry \ + -r crates-io \ + -r local=./target/package/tmp-registry \ + -- \ + cargo +1.92 publish \ + -p hyperlight-wasm-aot \ + -p hyperlight-wasm-macro \ + -p hyperlight-wasm-runtime \ + -p hyperlight-wasm env: CARGO_REGISTRY_TOKEN: ${{ steps.crates-io-auth.outputs.token }} shell: bash diff --git a/Cargo.lock b/Cargo.lock index 09dd995..200789c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1485,8 +1485,9 @@ dependencies = [ [[package]] name = "hyperlight-common" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4187a7affab21aa49e498781595648437ac22cfdf94753c3200eddf89f7ab98c" dependencies = [ "anyhow", "flatbuffers", @@ -1499,8 +1500,9 @@ dependencies = [ [[package]] name = "hyperlight-component-macro" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f814ad0745e14be12779361222d63a82928c0c6ce27612c0c89ed925d8957433" dependencies = [ "env_logger", "hyperlight-component-util", @@ -1514,8 +1516,9 @@ dependencies = [ [[package]] name = "hyperlight-component-util" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dbaeeecb5097a74d57193aae73701af724295375b681177025e9ce278ed4798" dependencies = [ "itertools 0.14.0", "prettyplease", @@ -1528,8 +1531,9 @@ dependencies = [ [[package]] name = "hyperlight-guest" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e6132c20b413ba14ad6967c3c941702276773d3bc749569e746e3d1df3dff3" dependencies = [ "anyhow", "flatbuffers", @@ -1541,8 +1545,9 @@ dependencies = [ [[package]] name = "hyperlight-guest-bin" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b84470d8d2f9647a02f6bf5287f4083937df6452cacac028cd772f3796c6e2f3" dependencies = [ "buddy_system_allocator", "cc", @@ -1561,8 +1566,9 @@ dependencies = [ [[package]] name = "hyperlight-guest-macro" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "440596a4204f3c60da9e11da838bcd280bf350b2087361a0ebf69c088bb76423" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1572,8 +1578,9 @@ dependencies = [ [[package]] name = "hyperlight-guest-tracing" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2c1db4d357e8ff0e0f9e26432b38e079d7d7949daa063effeb25bbdce50212" dependencies = [ "hyperlight-common", "spin", @@ -1583,8 +1590,9 @@ dependencies = [ [[package]] name = "hyperlight-host" -version = "0.13.0" -source = "git+https://github.com/hyperlight-dev/hyperlight?rev=c9a1a4cefce6a085af92e375121e9f1b1c8deeec#c9a1a4cefce6a085af92e375121e9f1b1c8deeec" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05a62d79d2871137b0feea8db77e222289594766e2d6902ef0bdb0d65d8edda6" dependencies = [ "anyhow", "bitflags 2.11.0", @@ -1630,7 +1638,7 @@ dependencies = [ [[package]] name = "hyperlight-wasm" -version = "0.13.0" +version = "0.13.1" dependencies = [ "anyhow", "blake3", @@ -1675,7 +1683,7 @@ dependencies = [ [[package]] name = "hyperlight-wasm-aot" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cargo-util-schemas", "cargo_metadata", @@ -1686,7 +1694,7 @@ dependencies = [ [[package]] name = "hyperlight-wasm-macro" -version = "0.13.0" +version = "0.13.1" dependencies = [ "hyperlight-component-util", "itertools 0.14.0", @@ -1697,7 +1705,7 @@ dependencies = [ [[package]] name = "hyperlight-wasm-runtime" -version = "0.13.0" +version = "0.13.1" dependencies = [ "cargo_metadata", "cc", diff --git a/Cargo.toml b/Cargo.toml index d6eaa73..d02c239 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ exclude = [ "src/tests/rust_guests/rust_wasm_samples", "src/tests/rust_guests/co resolver = "2" [workspace.package] -version = "0.13.0" +version = "0.13.1" edition = "2024" rust-version = "1.89" license = "Apache-2.0" @@ -13,11 +13,11 @@ repository = "https://github.com/hyperlight-dev/hyperlight-wasm" readme = "README.md" [workspace.dependencies] -hyperlight-common = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false } -hyperlight-component-macro = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" } -hyperlight-component-util = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" } -hyperlight-guest = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec" } -hyperlight-guest-bin = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", features = [ "printf" ] } -hyperlight-host = { git = "https://github.com/hyperlight-dev/hyperlight", rev = "c9a1a4cefce6a085af92e375121e9f1b1c8deeec", default-features = false, features = ["executable_heap"] } -hyperlight-wasm-macro = { version = "0.13.0", path = "src/hyperlight_wasm_macro" } -hyperlight-wasm-runtime = { version = "0.13.0", path = "src/hyperlight_wasm_runtime" } +hyperlight-common = { version = "0.13.1", default-features = false } +hyperlight-component-macro = { version = "0.13.1" } +hyperlight-component-util = { version = "0.13.1" } +hyperlight-guest = { version = "0.13.1" } +hyperlight-guest-bin = { version = "0.13.1", features = [ "printf" ] } +hyperlight-host = { version = "0.13.1", default-features = false, features = ["executable_heap"] } +hyperlight-wasm-macro = { version = "0.13.1", path = "src/hyperlight_wasm_macro" } +hyperlight-wasm-runtime = { version = "0.13.1", path = "src/hyperlight_wasm_runtime" } diff --git a/src/hyperlight_wasm/src/sandbox/wasm_sandbox.rs b/src/hyperlight_wasm/src/sandbox/wasm_sandbox.rs index 072042d..b468bd0 100644 --- a/src/hyperlight_wasm/src/sandbox/wasm_sandbox.rs +++ b/src/hyperlight_wasm/src/sandbox/wasm_sandbox.rs @@ -87,7 +87,7 @@ impl WasmSandbox { .as_mut() .ok_or_else(|| new_error!("WasmSandbox is None"))?; - if let Ok(len) = inner.map_file_cow(file.as_ref(), MAPPED_BINARY_VA) { + if let Ok(len) = inner.map_file_cow(file.as_ref(), MAPPED_BINARY_VA, None) { inner.call::<()>("LoadWasmModulePhys", (MAPPED_BINARY_VA, len))?; } else { let wasm_bytes = std::fs::read(file)?; diff --git a/src/hyperlight_wasm_runtime/Cargo.toml b/src/hyperlight_wasm_runtime/Cargo.toml index 6db3863..0814f88 100644 --- a/src/hyperlight_wasm_runtime/Cargo.toml +++ b/src/hyperlight_wasm_runtime/Cargo.toml @@ -7,6 +7,9 @@ homepage.workspace = true repository.workspace = true readme.workspace = true edition = "2021" +description = """ +hyperlight-wasm-runtime is a rust binary crate that provides the WebAssembly runtime binary for hyperlight-wasm. +""" [lib] test = false