Skip to content

Commit

Permalink
Set protobuf and gogo dependencies LS-7541 (#35)
Browse files Browse the repository at this point in the history
* Regenerate golang protos

* Add a version to make dep happy

* Reverts

* Reverts

* Set both protobuf and gogo versions to 1.0.0

* Remove file

* Bump gogo to 1.2.1

* Simplify makefile
  • Loading branch information
jmacd authored Mar 10, 2019
1 parent b875161 commit 082dbbf
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 23 deletions.
46 changes: 32 additions & 14 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[[constraint]]
name = "github.com/gogo/protobuf"
version = "0.5.0"
version = "1.2.1"

[[constraint]]
branch = "master"
name = "github.com/golang/protobuf"
version = "1.0.0"

[[constraint]]
branch = "master"
Expand Down
19 changes: 12 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,28 +37,33 @@ build: test
proto: $(GOGO_GENTGTS) $(PBUF_GENTGTS) $(FAKES)

test: $(TEST_SOURCES)
dep ensure
dep ensure -v
@mkdir -p $(TMPNAME)
go test -v ./golang

clean:
$(call clean_protoc_targets,$(GOGO_GENTGTS) $(PBUF_GENTGTS))
rm -rf $(TMPNAME)

proto-links: $(GOGO_LINKS) $(PBUF_LINKS)

$(GOGO_LINKS): $(GOLANG)-$(GOGO)-%-link: %.proto
$(TMPNAME):
@mkdir -p $(TMPNAME)

$(GOGO_LINKS): $(GOLANG)-$(GOGO)-%-link: %.proto $(TMPNAME)
$(call gen_protoc_link,$<,$@,$(GOGO))

$(PBUF_LINKS): $(GOLANG)-$(PBUF)-%-link: %.proto
$(PBUF_LINKS): $(GOLANG)-$(PBUF)-%-link: %.proto $(TMPNAME)
$(call gen_protoc_link,$<,$@,$(PBUF))

$(GOGO_GENTGTS): $(GOLANG)-$(GOGO)-%: %.proto proto-links
$(GOGO_GENTGTS): $(GOLANG)-$(GOGO)-%: %.proto proto-links $(TMPNAME)
$(call gen_gogo_target,$<)

$(PBUF_GENTGTS): $(GOLANG)-$(PBUF)-%: %.proto proto-links
$(PBUF_GENTGTS): $(GOLANG)-$(PBUF)-%: %.proto proto-links $(TMPNAME)
$(call gen_protobuf_target,$<)

golang/gogo/collectorpb/collectorpbfakes/fake_collector_service_client.go: golang/gogo/collectorpb/collector.pb.go
golang/gogo/collectorpb/collectorpbfakes/fake_collector_service_client.go: golang/gogo/collectorpb/collector.pb.go $(TMPNAME)
$(call generate_fake,$@,$<,CollectorServiceClient)

golang/protobuf/collectorpb/collectorpbfakes/fake_collector_service_client.go: golang/protobuf/collectorpb/collector.pb.go
golang/protobuf/collectorpb/collectorpbfakes/fake_collector_service_client.go: golang/protobuf/collectorpb/collector.pb.go $(TMPNAME)
$(call generate_fake,$@,$<,CollectorServiceClient)

0 comments on commit 082dbbf

Please sign in to comment.