Fix wasm-opt --version parsing
#248
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
ascjones
approved these changes
Apr 6, 2021
src/cmd/build.rs
Outdated
| @@ -493,30 +493,37 @@ fn check_wasm_opt_version_compatibility(wasm_opt_path: &Path) -> Result<()> { | |||
| let version_stdout = str::from_utf8(&cmd.stdout) | |||
| .expect("Cannot convert stdout output of wasm-opt to string") | |||
| .trim(); | |||
| let re = Regex::new(r"wasm-opt version (\d+)\s+").unwrap(); | |||
| let re = Regex::new(r"wasm-opt version (\d+)").unwrap(); | |||
There was a problem hiding this comment.
I didn't spot it in the original PR but this should be an expect("invalid regex") or such.
There was a problem hiding this comment.
Argh! Maybe we should consider adding a clippy rule for unwrap() outside tests.
|
This might need a |
Merged
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.
Closes #247.
The issue was that binaryen includes more extensive version information in the
--versionoutput only if built from source. If installed via a package manager the version output can be more compact.I've also escalated this into the ticket https://github.com/paritytech/ci_cd/issues/121, to install
binaryenfrom a package manager in our CI.