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

Patch in ecf04cc and 49f0fb9 from gRPC. #7850

Merged
merged 3 commits into from
Aug 13, 2019
Merged

Conversation

lberki
Copy link
Contributor

@lberki lberki commented Aug 7, 2019

This is so that Envoy keeps building with the --incompatible_disable_legacy_proto_provider command line option of Bazel which is to be flipped in 1.0 .

For an explanation of how to fill out the fields, please see the relevant section
in PULL_REQUESTS.md

Description:
Risk Level:
Testing:
Docs Changes:
Release Notes:
[Optional Fixes #Issue]
[Optional Deprecated:]

Copy link
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

Thanks for working on this!

bazel/repositories.bzl Show resolved Hide resolved
bazel/repositories.bzl Show resolved Hide resolved
@lizan
Copy link
Member

lizan commented Aug 7, 2019

Does this fix #7835 too?

@lberki
Copy link
Contributor Author

lberki commented Aug 8, 2019

Nope, those are different issues -- #7835 is about a breakage that stems from gRPC using properties of the output tree Bazel never guaranteed and is about breakage with Bazel 0.29, whereas #7863 is a known-incompatible change that will be broken in 1.0 .

@lizan
Copy link
Member

lizan commented Aug 8, 2019

Can you add a patch for #7835 as well? That’s a breakage coming sooner.

@lberki
Copy link
Contributor Author

lberki commented Aug 9, 2019

Done. It's not merged yet, but I guess that's OK?

lizan
lizan previously approved these changes Aug 9, 2019
Copy link
Member

@lizan lizan left a comment

Choose a reason for hiding this comment

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

Thanks, can you fix DCO? Then I can merge this.

This is so that Envoy keeps building with the --incompatible_disable_legacy_proto_provider command line option of Bazel which is to be flipped in 1.0 .

Signed-off-by: Lukacs T. Berki <lberki@google.com>
Signed-off-by: Lukacs T. Berki <lberki@google.com>
Signed-off-by: Lukacs T. Berki <lberki@google.com>
@lberki
Copy link
Contributor Author

lberki commented Aug 9, 2019

Paperwork complete!

@lberki
Copy link
Contributor Author

lberki commented Aug 13, 2019

Gentle ping! This fixes a breakage in the coming-very-soon Bazel 0.29.

@lizan
Copy link
Member

lizan commented Aug 13, 2019

@lberki we just had a security release today, I was holding this change and will merge later today.

@lizan lizan merged commit 1dc418f into envoyproxy:master Aug 13, 2019
@lberki
Copy link
Contributor Author

lberki commented Aug 14, 2019

Thank you! I verified that this fixes the potential breakage, so I'll submit our flag flip.

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

Successfully merging this pull request may close these issues.

2 participants