-
Notifications
You must be signed in to change notification settings - Fork 782
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
Move build proto dependencies to separate go.mod #3377
Merged
Merged
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
yiminc
approved these changes
Sep 13, 2022
dnr
reviewed
Sep 13, 2022
Makefile
Outdated
@@ -66,22 +71,17 @@ INTEG_TEST_NDC_ROOT := ./host/ndc | |||
PROTO_ROOT := proto | |||
PROTO_FILES = $(shell find ./$(PROTO_ROOT)/internal -name "*.proto") | |||
PROTO_DIRS = $(sort $(dir $(PROTO_FILES))) | |||
PROTO_IMPORTS := -I=$(PROTO_ROOT)/internal -I=$(PROTO_ROOT)/api -I=$(GOPATH)/src/github.com/temporalio/gogo-protobuf/protobuf | |||
PROTO_IMPORTS := -I=$(PROTO_ROOT)/internal -I=$(PROTO_ROOT)/api -I=$(shell go env GOMODCACHE)/github.com/temporalio/gogo-protobuf@$(GOGO_PROTOBUF_VERSION)/protobuf |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think a better way to do this is to do
go list -f '{{.Dir}}' github.com/temporalio/gogo-protobuf/protobuf
to make that work we need an explicit dependency on github.com/temporalio/gogo-protobuf/protobuf
in go.mod, which should be easy, just added it to PINNED_DEPENDENCIES with that version and add an import in some go file so it's used
73872fb
to
5c48a55
Compare
dnr
reviewed
Sep 13, 2022
6a1af62
to
0296454
Compare
dnr
reviewed
Sep 13, 2022
dnr
approved these changes
Sep 14, 2022
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.
What changed?
Move build proto dependencies to separate
go.mod
.Why?
To provide better control over build dependency versions.
How did you test it?
Run locally and Buildkite.
Potential risks
No risks.
Is hotfix candidate?
No.