diff --git a/Cargo.lock b/Cargo.lock index 0dedd7c6a..8538e3b53 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -368,14 +368,6 @@ dependencies = [ "wincolor 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "test-protoc" -version = "0.0.0" -dependencies = [ - "protobuf 2.10.0-pre", - "protoc 2.10.0-pre", -] - [[package]] name = "thread_local" version = "0.3.6" diff --git a/Cargo.toml b/Cargo.toml index 19d3f163f..09d98905a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,8 @@ [workspace] members = [ "protoc", - "protoc/test-protoc", + # Exclude test-protoc from the project, because it depends on binary + #"protoc/test-protoc", "protoc-rust", "protobuf", "protobuf-codegen", diff --git a/ci/run.sh b/ci/run.sh index 495101831..d9cb08036 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -19,9 +19,20 @@ protobuf-codegen-pure-test/test.sh protoc/test.sh cargo build --all --all-targets +check_protoc_crate() { + # test depends on `protoc-gen-rust` binary, thus it cannot be a part of workspace + cargo build -p protobuf-codegen + ( + cd protoc/test-protoc + cargo check + ) +} + if [ -z "$ON_WINDOWS" ]; then cargo doc -p protobuf cargo doc -p protoc + + check_protoc_crate fi # vim: set ts=4 sw=4 et: diff --git a/protoc/test-protoc/Cargo.toml b/protoc/test-protoc/Cargo.toml index f23a2777f..d80dc3708 100644 --- a/protoc/test-protoc/Cargo.toml +++ b/protoc/test-protoc/Cargo.toml @@ -1,3 +1,5 @@ +[workspace] + [package] name = "test-protoc" version = "0.0.0"