From 1781077bcd199e7d55ad7b8425db2b8cb2e55846 Mon Sep 17 00:00:00 2001 From: Timo Stamm Date: Tue, 8 Oct 2024 17:37:24 +0200 Subject: [PATCH] Update to buf.gen.yaml v2 Signed-off-by: Timo Stamm --- Makefile | 4 +--- buf.gen.yaml | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 4cbbc39b..2a37b3b9 100644 --- a/Makefile +++ b/Makefile @@ -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 \ @@ -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) diff --git a/buf.gen.yaml b/buf.gen.yaml index 28dfaf64..2614e96c 100644 --- a/buf.gen.yaml +++ b/buf.gen.yaml @@ -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