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 commented Jan 8, 2020

This is a partial revert of 7b28278 to unblock, e.g., grpc/grpc#21590 or lyft/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 7b28278 to unblock, e.g., grpc/grpc#21590 or lyft/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.
@googlebot googlebot added the cla: yes label Jan 8, 2020
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"),

This comment has been minimized.

Copy link
@Yannic

Yannic Jan 8, 2020

Author Contributor

@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.

This comment has been minimized.

Copy link
@lberki

lberki Jan 10, 2020

Contributor

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

This comment has been minimized.

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

This comment has been minimized.

Copy link
Contributor

rafi-kamal commented Jan 8, 2020

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

@Yannic

This comment has been minimized.

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
2 checks passed
2 checks passed
Mergeable Mergeable Run has been Completed!
Details
cla/google All necessary CLAs are signed
rafi-kamal added 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 lyft/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 added 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 lyft/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
5 participants
You can’t perform that action at this time.