Skip to content

Commit

Permalink
build(cargo): pin wasmtime to a git rev
Browse files Browse the repository at this point in the history
This is required to be able to update nightly toolchain without breaking
Windows builds.

bytecodealliance/wasmtime#4940 is the patch
required, but it will only land in 2.0.0 according to bytecodealliance/wasmtime#4940 (comment)

Pin Wasmtime to a git rev until 2.0.0 release

Signed-off-by: Roman Volosatovs <roman@profian.com>
  • Loading branch information
rvolosatovs committed Sep 23, 2022
1 parent 4ad7444 commit b995446
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 93 deletions.
152 changes: 64 additions & 88 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions crates/exec-wasmtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ zeroize = { version = "1.5.4", features = ["alloc"], default-features = false }

# wasmtime and its pinned dependencies
# these will need to be updated together
wasmtime = { version = "1.0.0", features = ["cranelift", "pooling-allocator"], default-features = false }
cap-std = { version = "0.25.0", default-features = false }
wasmtime = { git = "https://github.com/bytecodealliance/wasmtime", rev = "6f50ddaaf2ab8205b6e850361dd2cc662819f431", version = "2.0.0", features = ["cranelift", "pooling-allocator"], default-features = false }
cap-std = { version = "0.26.0", default-features = false }
io-lifetimes = { version = "0.7.3", default-features = false }
rustix = { version = "0.35.10", features = ["std"], default-features = false }
wasi-common = { version = "1.0.0", default-features = false }
wasmtime-wasi = { version = "1.0.0", features = ["sync"], default-features = false }
wiggle = { version = "1.0.0", default-features = false }
wasi-common = { git = "https://github.com/bytecodealliance/wasmtime", rev = "6f50ddaaf2ab8205b6e850361dd2cc662819f431", version = "2.0.0", default-features = false }
wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "6f50ddaaf2ab8205b6e850361dd2cc662819f431", version = "2.0.0", features = ["sync"], default-features = false }
wiggle = { git = "https://github.com/bytecodealliance/wasmtime", rev = "6f50ddaaf2ab8205b6e850361dd2cc662819f431", version = "2.0.0", default-features = false }

[target.'cfg(windows)'.dependencies]
io-extras = { version = "=0.15.0", default-features = false }
Expand Down
1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
src = pkgs.nix-gitignore.gitignoreRecursiveSource ignorePatterns self;

cargoLock.lockFileContents = builtins.readFile "${self}/Cargo.lock";
cargoLock.outputHashes."cranelift-bforest-0.89.0" = "sha256-ytUiONbe9pHceyNMtpjE2fRQF6SwO/rGXtDWQ3EkCK0="; # for Wasmtime 2.0.0 git rev

postPatch = ''
patchShebangs ./helper
Expand Down

0 comments on commit b995446

Please sign in to comment.