Skip to content
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

Update bindings and dependencies to WASI 0.2.0 #471

Merged
merged 2 commits into from
Feb 22, 2024

Conversation

dicej
Copy link
Contributor

@dicej dicej commented Feb 12, 2024

Now that WASI 0.2.0 has been released, we can update from the release candidate we were previously using. That includes updating various URLs in the Makefiles to point to newer deps; this is hopefully the last time we have to do that for a while. Updates include:

  • Upgrade to the v0.2.0 release of wasi-cli
  • Upgrade to wit-bindgen 0.17.0 instead of the temporary pre-release build we had been using
  • Refreshed bindings using the above
  • Upgrade to Wasmtime 17 for testing

In addition, this PR makes a couple of tweaks to the Makefiles to make them more robust:

  • Escape "." character in sed regex
  • Split the component new step into its own rule so that we never confuse core modules with components

- Escape "." character in `sed` regex
- Ensure that %.wasm target fails cleanly (i.e. without generating the target file) if `wasm-tools` fails

Signed-off-by: Joel Dice <[email protected]>
test/Makefile Outdated Show resolved Hide resolved
We now explicitly distinquish between core module files (%.core.wasm) and
component files (%.wasm), which helps avoid the trickery in my previous commit.

In order to test this properly, I needed to update the Wasmtime URL to point to
v17.0.0 instead of dev (which we needed to do anyway), and that in turn required
updating the bindings to use the final WASI 0.2.0 release.

Signed-off-by: Joel Dice <[email protected]>
@dicej dicej changed the title make the Makefiles a bit more robust Update bindings and dependencies to WASI 0.2.0 Feb 12, 2024
@dicej
Copy link
Contributor Author

dicej commented Feb 21, 2024

Any more feedback on this one? I'd like to get it merged soon-ish, since it will unblock further work on wasi-sockets.

Copy link
Member

@sbc100 sbc100 left a comment

Choose a reason for hiding this comment

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

I don't have any more feedback. Perhaps @sunfishcode could give final lgtm though?

@sunfishcode
Copy link
Member

Looks good, thanks!

@sunfishcode sunfishcode merged commit 55df1f5 into WebAssembly:main Feb 22, 2024
8 checks passed
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