Skip to content

Commit 4511e6d

Browse files
committed
workspace: drop the nested wasmi fork wiring from the build
Reverts the accommodations that let `pyre-wasm-runner` path-depend on the untracked `wasmi/crates/wasmi` fork, which lives outside the repository: - root Cargo.toml: remove `exclude = ["wasmi", "cel-rust", "pyre/pyre-wasm-runner"]` and restore `pyre/pyre-wasm-runner` to `members`, so it is a workspace member again rather than its own workspace root. - pyre-wasm-runner/Cargo.toml: `wasmi = "1.1"` from crates.io again, and version/edition/wasmtime inherited from the workspace again. - pyre-wasm-runner/src/wasmi_host.rs: back to the HashMap trace registry; the shared-indirect-table dispatch used the fork-only `Nullable` API. - check.py: build the runner with `-p` again, without fork-presence gating of the build step or of the default backend set. - pyre-ci.yml: run the wasm codegen_test step unconditionally on Linux. - Cargo.lock: restores the wasmtime dependency tree the exclusion had dropped; the only remaining delta against main is the new `cel` example package. Assisted-by: Claude
1 parent 94ff816 commit 4511e6d

6 files changed

Lines changed: 892 additions & 141 deletions

File tree

.github/workflows/pyre-ci.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -437,18 +437,12 @@ jobs:
437437
# majit-backend-wasm/tests/codegen_test.rs holds two #[ignore]d runtime
438438
# integration tests that run a bench on both the dynasm and wasm backends
439439
# and compare, so they need the release pyre-dynasm + pyre-wasm-runner and
440-
# the wasm-host module. check.py builds all three on Linux only when the
441-
# nested `wasmi` fork the runner path-depends on is present (it is excluded
442-
# from the outer workspace and absent in CI); this step gates on the same
443-
# fork so it skips wherever those artifacts were not built. The plain
444-
# `cargo test --all` job cannot run these: it never builds those artifacts.
440+
# the wasm-host module. check.py has just built all three on Linux (it adds
441+
# the wasm32 target above; WASM_MODULE_PATH is the .wasm-host.wasm the test
442+
# loads), so run the ignored tests against them here. The plain
443+
# `cargo test --all` job cannot: it never builds those artifacts.
445444
if: runner.os == 'Linux'
446-
run: |
447-
if [ ! -f wasmi/crates/wasmi/Cargo.toml ]; then
448-
echo "Skipping: nested wasmi fork absent; pyre-wasm-runner and wasm-host module were not built."
449-
exit 0
450-
fi
451-
cargo test -p majit-backend-wasm --test codegen_test -- --ignored
445+
run: cargo test -p majit-backend-wasm --test codegen_test -- --ignored
452446

453447
pyre-check-macos:
454448
name: pyre/check.py (macos-latest)

0 commit comments

Comments
 (0)