From 89b83bb81ab9637d63c58438fe9fe3580ad54c95 Mon Sep 17 00:00:00 2001 From: William Banfield Date: Mon, 15 Nov 2021 14:23:38 -0500 Subject: [PATCH] move buf yaml to root of spec repo --- buf.gen.yaml | 13 ------------- buf.yaml | 16 ---------------- scripts/protocgen.sh | 4 +++- 3 files changed, 3 insertions(+), 30 deletions(-) delete mode 100644 buf.gen.yaml delete mode 100644 buf.yaml diff --git a/buf.gen.yaml b/buf.gen.yaml deleted file mode 100644 index dc56781dd..000000000 --- a/buf.gen.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# The version of the generation template. -# Required. -# The only currently-valid value is v1beta1. -version: v1beta1 - -# The plugins to run. -plugins: - # The name of the plugin. - - name: gogofaster - # The the relative output directory. - out: proto - # Any options to provide to the plugin. - opt: Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,plugins=grpc,paths=source_relative diff --git a/buf.yaml b/buf.yaml deleted file mode 100644 index cc4aced57..000000000 --- a/buf.yaml +++ /dev/null @@ -1,16 +0,0 @@ -version: v1beta1 - -build: - roots: - - proto - - third_party/proto -lint: - use: - - BASIC - - FILE_LOWER_SNAKE_CASE - - UNARY_RPC - ignore: - - gogoproto -breaking: - use: - - FILE diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index d71831887..76885658e 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -9,6 +9,8 @@ set -euo pipefail : ${VERS:=master} URL_PATH=tarball/ +VERS=ba46bcc66b77e0c37921e47a2a29c574b38f2b73 + echo "fetching proto files" # Get shortened ref of commit @@ -31,7 +33,7 @@ find ./proto/tendermint -name '*.proto' -not -path "./proto/tendermint/abci/type # so that it can be moved into the ./abci/types directory. sh ./scripts/protopackage.sh ./proto/tendermint/abci/types.proto $MODNAME "abci/types" -buf generate --path proto/tendermint --template ./${OUTDIR}/proto/buf.gen.yaml --config ./${OUTDIR}/proto/buf.yaml +buf generate --path proto/tendermint --template ./${OUTDIR}/buf.gen.yaml --config ./${OUTDIR}/buf.yaml mv ./proto/tendermint/abci/types.pb.go ./abci/types