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

pgv: bump dependency to 30da78c. #4551

Merged
merged 4 commits into from
Sep 28, 2018
Merged

pgv: bump dependency to 30da78c. #4551

merged 4 commits into from
Sep 28, 2018

Conversation

htuch
Copy link
Member

@htuch htuch commented Sep 27, 2018

This should unblock Windows, fix the long CLI issue and also fuzz weak link problems.

Signed-off-by: Harvey Tuch htuch@google.com

This should unblock Windows, fix the long CLI issue and also fuzz weak link problems.

Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch
Copy link
Member Author

htuch commented Sep 27, 2018

@sesmith177 @rodaine

Signed-off-by: Harvey Tuch <htuch@google.com>
@@ -1,13 +1,20 @@
BAZEL_SKYLIB_SHA = "b5f6abe419da897b7901f90cbab08af958b97a8f3575b0d3dd062ac7ce78541f"
Copy link
Contributor

Choose a reason for hiding this comment

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

In order to be consistent with other dependencies what about:

BAZEL_SKYLIB_RELEASE = "0.5.0"
BAZEL_SKYLIB_SHA = "b5f6abe419da897b7901f90cbab08af958b97a8f3575b0d3dd062ac7ce78541f"

name = "bazel_skylib",
url = "https://github.com/bazelbuild/bazel-skylib/archive/0.5.0.tar.gz",
sha256 = BAZEL_SKYLIB_SHA,
strip_prefix = "bazel-skylib-0.5.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

And

        sha256 = BAZEL_SKYLIB_SHA,
        strip_prefix = "bazel-skylib-" + BAZEL_SKYLIB_RELEASE,
        url = "https://github.com/bazelbuild/bazel-skylib/archive/" + BAZEL_SKYLIB_RELEASE + ".tar.gz",

Signed-off-by: Harvey Tuch <htuch@google.com>
@moderation
Copy link
Contributor

FYI, with this PR I've been able to upgrade to rules_go 0.14.1 which aligns with PGV's version which is currently at 0.14.0 - https://github.com/lyft/protoc-gen-validate/blob/master/WORKSPACE#L7. Great to be able to move past 0.11.2

@sesmith177
Copy link
Member

It looks like we'll need one more set of changes to PGV to get it to work on Windows; we've submitted bufbuild/protoc-gen-validate#104

The issue is the DELETE enum here:

Specifically, <windows.h> defines a DELETE macro, so if it ever gets included before the generated base.pb.h, the enum will be overwritten and compilation will fail.

@htuch htuch requested review from lizan and rodaine September 27, 2018 21:58
@htuch
Copy link
Member Author

htuch commented Sep 27, 2018

@sesmith177 ack. Are we good to merge this PR as an intermediate step?

rodaine
rodaine previously approved these changes Sep 27, 2018
Copy link
Member

@rodaine rodaine left a comment

Choose a reason for hiding this comment

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

LGTM!

lizan
lizan previously approved these changes Sep 27, 2018
@sesmith177
Copy link
Member

yep, we'll PR the update to PGV.

It also looks like this comment is no longer true now:

# Under the hood, this is just an extension of the Protobuf library's
# bespoke cc_proto_library. It doesn't consume proto_library as a proto
# provider. Hopefully one day we can move to a model where this target and
# the proto_library above are aligned.

@moderation
Copy link
Contributor

@sesmith177 Yes the comment should be removed. In @akonradi's earlier diff's on this PR he had removed those 4 lines.

@rodaine
Copy link
Member

rodaine commented Sep 27, 2018

bufbuild/protoc-gen-validate#104 has been merged

Signed-off-by: Harvey Tuch <htuch@google.com>
@htuch htuch dismissed stale reviews from lizan and rodaine via 1f564c2 September 28, 2018 02:00
@htuch htuch changed the title pgv: bump dependency to 3bd820a. pgv: bump dependency to 30da78c. Sep 28, 2018
@htuch htuch merged commit 9297104 into envoyproxy:master Sep 28, 2018
@htuch htuch deleted the pgv-bump branch September 28, 2018 09:35
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.

5 participants