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

Blacklist .proto source files if Bazel allows us to #7065

Merged
merged 3 commits into from Jan 9, 2020

Conversation

Yannic
Copy link
Contributor

@Yannic Yannic commented Jan 8, 2020

This is a partial revert of 7b28278 to unblock, e.g., grpc/grpc#21590 or envoyproxy/envoy-mobile#617 until Bazel is fixed.

Note: this is a forward-compatible change that automatically switches to the behavior intended by 7b28278 when a compatible Bazel is released without requiring users to upgrade Protobuf. We will revert this change when Bazel is fixed.

This is a partial revert of protocolbuffers@7b28278 to unblock, e.g., grpc/grpc#21590 or envoyproxy/envoy-mobile#617 until Bazel is fixed.

Note: this is a forward-compatible change that automatically switches to the behavior intended by protocolbuffers@7b28278 when a compatible Bazel is released without requiring users to upgrade Protobuf. We will revert this change when Bazel is fixed.
BUILD Outdated
@@ -986,9 +986,11 @@ cc_library(
],
)

reject_blacklisted_files = not hasattr(proto_common, "proto_lang_toolchain_rejects_files_do_not_use_or_we_will_break_you_without_mercy"),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@lberki @cushon @hlopko I'd love to get your lgtm on this "feature flag" so we don't have to synchronize flipping a future --incompatible_blacklisted_protos_requires_proto_info (or whatever that flag will be called) with protobuf releases. See bazelbuild/bazel#10493 and bazelbuild/bazel#10484 for context.

Copy link
Contributor

Choose a reason for hiding this comment

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

Do I understand correctly that the sole reason for this change is http://github.com/bazelbuild/bazel/issues/10484 and thus if that is fixed, this change and the flag becomes unnecessary?

@Yannic Yannic changed the title Blacklist .proto source files is Bazel allows us to Blacklist .proto source files if Bazel allows us to Jan 8, 2020
@Yannic
Copy link
Contributor Author

Yannic commented Jan 8, 2020

@rafi-kamal Sorry, I did move some parts into variables after testing it which left trailing , behind :/. Please re-trigger CI, thanks.

@rafi-kamal
Copy link
Contributor

FYI the Linux Ruby Release and MacOS Ruby 2.3 tests are broken for a while, so the failures are likely not related.

@Yannic
Copy link
Contributor Author

Yannic commented Jan 9, 2020

@rafi-kamal Thanks! The failures are indeed unrelated, we're only touching Bazel BUILD files here, which aren't used by Ruby.

I think we can merge (& cherry-pick onto 3.11.x) this now.

@rafi-kamal rafi-kamal merged commit 082cc23 into protocolbuffers:master Jan 9, 2020
rafi-kamal pushed a commit that referenced this pull request Jan 9, 2020
* Blacklist .proto source files is Bazel allows us to

This is a partial revert of 7b28278 to unblock, e.g., grpc/grpc#21590 or envoyproxy/envoy-mobile#617 until Bazel is fixed.

Note: this is a forward-compatible change that automatically switches to the behavior intended by 7b28278 when a compatible Bazel is released without requiring users to upgrade Protobuf. We will revert this change when Bazel is fixed.

* Remove trailing ,

* Update BUILD
rafi-kamal pushed a commit that referenced this pull request Jan 9, 2020
* Blacklist .proto source files is Bazel allows us to

This is a partial revert of 7b28278 to unblock, e.g., grpc/grpc#21590 or envoyproxy/envoy-mobile#617 until Bazel is fixed.

Note: this is a forward-compatible change that automatically switches to the behavior intended by 7b28278 when a compatible Bazel is released without requiring users to upgrade Protobuf. We will revert this change when Bazel is fixed.

* Remove trailing ,

* Update BUILD
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants