Skip to content

wasmtime: update to v1.0.1. #309

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.

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

Merged
merged 19 commits into from
Oct 27, 2022
Merged

Conversation

RiverPhillips
Copy link
Contributor

@RiverPhillips RiverPhillips commented Sep 27, 2022

Upgrade wasmtime to v1.0.0

@RiverPhillips
Copy link
Contributor Author

I was sent here from the Envoy repo and followed the steps here.

Let me know if they've changed and I need to do something different

@RiverPhillips RiverPhillips marked this pull request as ready for review September 27, 2022 19:28
@kfaseela
Copy link
Contributor

Thanks @RiverPhillips ! Hope you changed the cargo version to 0.14.1 as the steps I pointed to was a bit older one with version 0.12

@RiverPhillips
Copy link
Contributor Author

Cheers @kfaseela - I tried 16 but will try it again with 14

@RiverPhillips
Copy link
Contributor Author

RiverPhillips commented Sep 27, 2022

Looks like I'm still getting the following error. Seems like this is a transient reference - not sure the best way to resolve

 Target '@wasmtime__rustix__0_35_10//:rustix' contains an error and its package is in error and referenced by '@wasmtime__wasmtime_runtime__1_0_0//:wasmtime_runtime'

@PiotrSikora
Copy link
Member

You need to manually remove duplicate dependencies from errno and rustix crates (see: google/cargo-raze#451).

It should be pretty obvious what to remove when you compare the diff to the current version.

@RiverPhillips
Copy link
Contributor Author

Apologies for the force push, forgot the DCO.

I believe that should resolve it

@PiotrSikora
Copy link
Member

Hi @RiverPhillips, the latest commit in the series is wrong. It removes a legitimate dependency. You need to manually remove duplicate select statements from Bazel rules for errno and rustix crates (see: f8f1c07).

@RiverPhillips
Copy link
Contributor Author

Cheers @PiotrSikora I'll revisit ths when I can. I moved this weekend and don't yet have an Internet connection

@PiotrSikora
Copy link
Member

You need to manually remove duplicate select statements from Bazel rules for errno and rustix crates (see: f8f1c07).

This is still missing and results in test failing. You might be able to apply that patch directly after updating the crate versions.

@RiverPhillips
Copy link
Contributor Author

Hi @PiotrSikora, sorry it's taken me a while to get this done

bazel query 'deps(//bazel/cargo/...)'
cd wasmsign && cargo raze && cd ..
cd wasmtime && cargo raze && cd ..
# Ignore manual changes in "errno" and "rustix" crates until fixed in cargo-raze.
# See: https://github.com/google/cargo-raze/issues/451
git diff --exit-code -- ':!wasmtime/remote/BUILD.errno-0.*.bazel' ':!wasmtime/remote/BUILD.rustix-0.*.bazel'

Is now running for me locally so it appears I've finally resolved this

@PiotrSikora
Copy link
Member

You need to remove the include_str! macro from the failing crates (see error log), since it doesn't work with Bazel.

Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
This reverts commit 12b7819.

Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
This reverts commit b19db1b.

Signed-off-by: river phillips <[email protected]>
This reverts commit ea87e0f.

Signed-off-by: river phillips <[email protected]>
@RiverPhillips RiverPhillips changed the title deps: bump wasmtime -> 1.0.0 deps: bump wasmtime -> 1.0.1 Oct 23, 2022
@RiverPhillips RiverPhillips requested review from PiotrSikora and removed request for mpwarres and kfaseela October 23, 2022 14:55
Signed-off-by: river phillips <[email protected]>
@PiotrSikora
Copy link
Member

Hi @RiverPhillips, you need to again remove the duplicate select statements from Bazel rules for errno and rustix crates (see: f8f1c07), since they were re-added in the bump to v1.0.1.

Signed-off-by: river phillips <[email protected]>
@RiverPhillips
Copy link
Contributor Author

🤦‍♂️ I've been overwriting my changes when I've tried validating them.

Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
Signed-off-by: river phillips <[email protected]>
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! Do you want to do v2.0.0 next? ;)

@PiotrSikora PiotrSikora changed the title deps: bump wasmtime -> 1.0.1 wasmtime: update to v1.0.1. Oct 27, 2022
@PiotrSikora PiotrSikora merged commit 0176f43 into proxy-wasm:master Oct 27, 2022
@RiverPhillips
Copy link
Contributor Author

Sure, hopefully I know what I'm doing now 😅

RiverPhillips added a commit to RiverPhillips/proxy-wasm-cpp-host that referenced this pull request Oct 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants