Skip to content
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

Update to buf.gen.yaml v2 #934

Merged
merged 3 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ build: generate ## Build all packages

.PHONY: generate
generate: $(BIN)/buf $(BIN)/license-header ## Regenerate code and licenses
rm -rf internal/gen
rm -rf testing/grpcwebclient/gen
buf generate proto
license-header \
--license-type apache \
Expand Down Expand Up @@ -138,7 +136,7 @@ $(BIN)/grpcserver: Makefile generate

$(BIN)/buf: Makefile
@mkdir -p $(@D)
$(GO) install github.com/bufbuild/buf/cmd/buf@v1.26.1
$(GO) install github.com/bufbuild/buf/cmd/buf@v1.44.0

$(BIN)/license-header: Makefile
@mkdir -p $(@D)
Expand Down
18 changes: 10 additions & 8 deletions buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
version: v1
version: v2
managed:
enabled: true
go_package_prefix:
default: connectrpc.com/conformance/internal/gen/proto/go
override:
- file_option: go_package_prefix
value: connectrpc.com/conformance/internal/gen/proto/go
clean: true
plugins:
- plugin: buf.build/protocolbuffers/go:v1.31.0
- remote: buf.build/protocolbuffers/go:v1.31.0
out: internal/gen/proto/go
opt: paths=source_relative
- plugin: buf.build/connectrpc/go
- remote: buf.build/connectrpc/go
out: internal/gen/proto/go
opt: paths=source_relative
- plugin: buf.build/grpc/go:v1.3.0
- remote: buf.build/grpc/go:v1.3.0
out: internal/gen/proto/go
opt: paths=source_relative
- plugin: buf.build/grpc/web:v1.5.0
- remote: buf.build/grpc/web:v1.5.0
out: testing/grpcwebclient/gen/proto
opt: import_style=typescript,mode=grpcweb
- plugin: buf.build/protocolbuffers/js:v3.21.2
- remote: buf.build/protocolbuffers/js:v3.21.2
out: testing/grpcwebclient/gen/proto
opt: import_style=commonjs,binary
10 changes: 10 additions & 0 deletions buf.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: v2
modules:
- path: proto
name: buf.build/connectrpc/conformance
lint:
use:
- STANDARD
breaking:
use:
- FILE
8 changes: 0 additions & 8 deletions proto/buf.yaml

This file was deleted.

Loading