Skip to content

wasmtime: update to v0.30.0. #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 6 commits into from
Oct 18, 2021
Merged

wasmtime: update to v0.30.0. #194

merged 6 commits into from
Oct 18, 2021

Conversation

phlax
Copy link
Contributor

@phlax phlax commented Oct 7, 2021

attempting to update wasmtime in Envoy main (cf envoyproxy/envoy#18499 (review))

not sure how to regenerate crates

@phlax
deps: Bump wasmtime -> 0.30.0
f152086 
Signed-off-by: Ryan Northey <[email protected]>
@phlax phlax force-pushed the deps-bump-wasmtime branch from 0865b88 to f152086 Compare October 7, 2021 16:31
@PiotrSikora
Copy link
Member

not sure how to regenerate crates

cd bazel/cargo
cargo install cargo-raze --version 0.12.0
cargo raze --generate-lockfile
git add .

@phlax
regenerate-crates
852223d 
Signed-off-by: Ryan Northey <[email protected]>
@phlax phlax force-pushed the deps-bump-wasmtime branch from 588a3ef to 852223d Compare October 7, 2021 16:52
@phlax
Copy link
Contributor Author

phlax commented Oct 7, 2021

thanks, updated

PiotrSikora
PiotrSikora requested changes Oct 14, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to bump versions to v0.30.0 in bazel/cargo/Cargo.toml and regenerate crates again.

@phlax
Copy link
Contributor Author

phlax commented Oct 14, 2021

thanks, i updated again

i had to remove the path from the wasmtime-c-api-macros dependency - not sure if this is due to my cargo version changing

@PiotrSikora PiotrSikora changed the title deps: Bump wasmtime -> 0.30.0 wasmtime: update to v0.30.0. Oct 14, 2021
@phlax
Copy link
Contributor Author

phlax commented Oct 15, 2021

@PiotrSikora not sure how to resolve the error in CI

i bumped the wasmtime-c-api-macros dep in Cargo.toml in line with the change to the wasmtime version

grepping, and looking at the log failure it seems like there is a bazel dependency on version 0.19.0 - not sure if that is related

PiotrSikora
PiotrSikora requested changes Oct 15, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

grepping, and looking at the log failure it seems like there is a bazel dependency on version 0.19.0 - not sure if that is related

0.19.0 is the version of wasmtime-c-api-macros crate, but it's not published, so we're downloading it from wasmtime's repo.

bazel/cargo/Cargo.toml Outdated
@@ -10,8 +10,8 @@ path = "fake_lib.rs"
env_logger = "0.8"
anyhow = "1.0"
once_cell = "1.3"
wasmtime = {version = "0.26.0", default-features = false}
wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v0.26.0", path = "crates/c-api/macros"}
wasmtime = {version = "0.30.0", default-features = false}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to add , features = ['cranelift'] in wasmtime dependency (that's new in v0.30.0 and I ended up diffing changes in wasmtime to figure it out...). Once you regenerate crates (again), it should work fine.

phlax added 2 commits October 15, 2021 18:54
@phlax
bump-wasmtime-crate
861c571 
Signed-off-by: Ryan Northey <[email protected]>
@phlax
add-cranelift
11a6505 
Signed-off-by: Ryan Northey <[email protected]>
@phlax phlax force-pushed the deps-bump-wasmtime branch from b9a99f0 to 11a6505 Compare October 15, 2021 17:54
@phlax
Copy link
Contributor Author

phlax commented Oct 15, 2021

updated and regenerated lockfile - force-pushed to fix DCO

PiotrSikora
PiotrSikora reviewed Oct 15, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you update the package version from 0.25.0 to 0.30.0 in bazel/cargo/Cargo.toml as well? Thanks!

@phlax
bump-package-version
f29598f 
Signed-off-by: Ryan Northey <[email protected]>
@PiotrSikora
Copy link
Member

It looks that Cranelift needs a more recent version of Rust. See: #195.

@phlax
Copy link
Contributor Author

phlax commented Oct 15, 2021

It looks that Cranelift needs a more recent version of Rust

is that in CI/repo - or my local version?

I think i have a pretty recent version locally, so im guessing the former

@PiotrSikora
Copy link
Member

Both, since Bazel is using Rust version from rules_rust. #195 resolves the issue (confirmed locally), so we just need to wait until it's approved and merged to rebase this PR and fix the CI.

PiotrSikora
PiotrSikora approved these changes Oct 18, 2021
View reviewed changes
Copy link
Member

@PiotrSikora PiotrSikora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@PiotrSikora PiotrSikora merged commit 9ec1f94 into proxy-wasm:master Oct 18, 2021
@PiotrSikora PiotrSikora mentioned this pull request Dec 16, 2021
Merged
@kfaseela kfaseela mentioned this pull request Sep 27, 2022
Merged
@RiverPhillips RiverPhillips mentioned this pull request Sep 27, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PiotrSikora PiotrSikora PiotrSikora approved these changes

@mathetake mathetake Awaiting requested review from mathetake

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phlax @PiotrSikora