Skip to content

Commit

Permalink
Update tools
Browse files Browse the repository at this point in the history
  • Loading branch information
krapie committed Dec 11, 2023
1 parent 5e631a6 commit a9673b9
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 39 deletions.
21 changes: 4 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,26 +20,13 @@ GO_LDFLAGS += -X ${GO_PROJECT}/internal/version.BuildDate=${BUILD_DATE}
default: help

tools: ## install tools for developing yorkie
go install github.com/gogo/protobuf/[email protected]
go install github.com/gogo/protobuf/[email protected]
go install github.com/bufbuild/buf/cmd/[email protected]
go install google.golang.org/protobuf/cmd/[email protected]
go install connectrpc.com/connect/cmd/[email protected]
go install github.com/golangci/golangci-lint/cmd/[email protected]

proto: ## generate proto files
protoc \
-I=./api \
-I=$(GOPATH)/src \
--gofast_out=plugins=grpc,\
Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,\
Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,:./api/yorkie/v1 \
api/yorkie/v1/*.proto

protoset: ## generate protoset file
protoc \
-I=./api \
--descriptor_set_out=yorkie.protoset \
--include_imports \
api/yorkie/v1/*.proto
buf generate

build: ## builds an executable that runs in the current environment
CGO_ENABLED=0 go build -o $(EXECUTABLE) -ldflags "${GO_LDFLAGS}" ./cmd/yorkie
Expand Down
5 changes: 2 additions & 3 deletions api/yorkie/v1/admin.pb.go

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

5 changes: 2 additions & 3 deletions api/yorkie/v1/resources.pb.go

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

6 changes: 2 additions & 4 deletions api/yorkie/v1/v1connect/admin.connect.go

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

6 changes: 2 additions & 4 deletions api/yorkie/v1/v1connect/yorkie.connect.go

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

5 changes: 2 additions & 3 deletions api/yorkie/v1/yorkie.pb.go

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

3 changes: 0 additions & 3 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ plugins:
- plugin: go
out: api
opt: paths=source_relative
# - plugin: gofast
# out: api
# opt: Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,:./api/yorkie/v1,plugins=grpc,paths=source_relative
- plugin: connect-go
out: api
opt: paths=source_relative
4 changes: 2 additions & 2 deletions test/integration/tree_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ func TestTree(t *testing.T) {
root.GetTree("t").EditBulk(3, 3, []*json.TreeNode{{
Type: "text",
Value: "c",
}, &json.TreeNode{
}, {
Type: "text",
Value: "d",
}}, 0)
Expand All @@ -451,7 +451,7 @@ func TestTree(t *testing.T) {
root.GetTree("t").EditBulk(4, 4, []*json.TreeNode{{
Type: "p",
Children: []json.TreeNode{{Type: "text", Value: "cd"}},
}, &json.TreeNode{
}, {
Type: "i",
Children: []json.TreeNode{{Type: "text", Value: "fg"}},
}}, 0)
Expand Down

0 comments on commit a9673b9

Please sign in to comment.