Skip to content

Commit

Permalink
Merge pull request #318 from spacemeshos/update-tooling
Browse files Browse the repository at this point in the history
Update buf and plugins
  • Loading branch information
fasmat authored Mar 21, 2024
2 parents 9982d8a + 927a5bb commit 90209c6
Show file tree
Hide file tree
Showing 37 changed files with 130 additions and 522 deletions.
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ HTTPS_GIT := https://github.com/spacemeshos/api.git
SSH_GIT := ssh://[email protected]/spacemeshos/api.git

# This controls the version of buf to install and use.
BUF_VERSION := 1.26.1
BUF_VERSION := 1.30.0

GRPC_JSON_PROXY_VERSION := v2.19.1
PROTOC_GO_VERSION := v1.33.0
PROTOC_GEN_GO_VERSION := v1.3.0

# Everything below this line is meant to be static, i.e. only adjust the above variables. ###

Expand Down Expand Up @@ -59,9 +63,9 @@ $(BUF): protoc-plugins

# Download protoc plugins
protoc-plugins:
@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@v2.18.0
@go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.31.0
@go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0
@go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway@$(GRPC_JSON_PROXY_VERSION)
@go install google.golang.org/protobuf/cmd/protoc-gen-go@$(PROTOC_GO_VERSION)
@go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@$(PROTOC_GEN_GO_VERSION)
.PHONY: protoc-plugins

# local is what we run when testing locally.
Expand Down
2 changes: 1 addition & 1 deletion release/go/post/v1/service.pb.go

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

12 changes: 2 additions & 10 deletions release/go/post/v1/service.pb.gw.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/activation.pb.go

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

24 changes: 4 additions & 20 deletions release/go/spacemesh/v1/activation.pb.gw.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/activation_types.pb.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/admin.pb.go

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

30 changes: 5 additions & 25 deletions release/go/spacemesh/v1/admin.pb.gw.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/admin_types.pb.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/debug.pb.go

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

54 changes: 9 additions & 45 deletions release/go/spacemesh/v1/debug.pb.gw.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/debug_types.pb.go

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

2 changes: 1 addition & 1 deletion release/go/spacemesh/v1/global_state.pb.go

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

Loading

0 comments on commit 90209c6

Please sign in to comment.