Vendor protobuf tools #1592
Closed
Vendor protobuf tools #1592
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
helsaawy
force-pushed
the
proto-vendor-tools
branch
2 times, most recently
from
bd7a007
to
25d038b
Compare
anmaxvl
approved these changes
Dec 8, 2022
helsaawy
force-pushed
the
proto-vendor-tools
branch
from
25d038b
to
f96b45a
Compare
|
rebased to fix merge conflict |
Add `protobuild` and `protoc-gen-gogoctrd` to `tools.go` so they are tracked and vendored. This way, protobufs are always generated with the same version, and `protoc-gen-gogoctrd` can be installed directly via `go install`. Simplify GitHub CI protobuf job. Add empty `after` section to Protobuild to suppress errors about missing directories `usr/local/include` and `/usr/include` Add protobuf file to gitignore so it does not affect `git diff` results. Remove unneeded `gogoproto/gogo.proto` in protobuf files. Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
helsaawy
force-pushed
the
proto-vendor-tools
branch
from
f96b45a
to
2c1df91
Compare
| @@ -37,6 +37,9 @@ rootfs-conv/* | |||
| deps/* | |||
| out/* | |||
|
|
|||
| # protobuf files | |||
| /protobuf/* | |||
There was a problem hiding this comment.
should we also have "protobuf/*" without the root slash?
There was a problem hiding this comment.
iirc, i ran into an issue where a vendored module had a folder called protobuf, and it caused all kinds of shenanigans 😅
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
|
obe by #1706 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add
protobuildandprotoc-gen-gogoctrdtotools.goso they are tracked and vendored.This way, protobufs are always generated with the same version, and
protoc-gen-gogoctrdcan be installed directly viago install, instead of needing to pullcontainerd/containerdand install from there.Simplify GitHub CI protobuf job.
Add empty
aftersection toProtobuild.tomlto suppress errors about missing directoriesusr/local/includeand/usr/includeRemove unneeded
gogoproto/gogo.protoin protobuf files, which also raises protobuild warnings.Add protobuf file to gitignore so it does not affect
git diffresults.Signed-off-by: Hamza El-Saawy hamzaelsaawy@microsoft.com