Update WasmExecutor for WABT API changes #6612
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The API for WABT has changed in top-of-tree. This fixes the incompatibilities. It also (temporarily) changes to pulling WABT from top-of-tree (rather than a known release) as the most recent labeled release doesn't have these changes. (We'll change back to a fixed WABT release when the next one is released.)
abadams
approved these changes
Feb 11, 2022
alexreinking
requested changes
Feb 11, 2022
dependencies/wasm/CMakeLists.txt
Outdated
| @@ -16,7 +16,7 @@ if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows") | |||
| endif () | |||
|
|
|||
| if (WITH_WABT) | |||
| set(WABT_VER 1.0.25) | |||
| set(WABT_VER main) | |||
There was a problem hiding this comment.
I am worried about this making our builds unpredictable. I think better would be to hard-code an override-able git commit hash, like so:
Suggested change
| set(WABT_VER main) | |
| set(WABT_VER "09c40635207d42dd30ffaca22477fd3491dd9e7d" | |
| CACHE STRING "WABT commit to download (tag, branch name, or hash)") |
and then in CI we can pull nightlies by setting the WABT_VER cache variable to main.
There was a problem hiding this comment.
(09c40635207d42dd30ffaca22477fd3491dd9e7d is the current top-of-tree hash)
There was a problem hiding this comment.
Fair, keep in mind this should be very short term
alexreinking
approved these changes
Feb 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The API for WABT has changed in top-of-tree. This fixes the incompatibilities. It also (temporarily) changes to pulling WABT from top-of-tree (rather than a known release) as the most recent labeled release doesn't have these changes. (We'll change back to a fixed WABT release when the next one is released.)