From 6cfca6ce4ee03b54295f9e5e83879c6240a9038f Mon Sep 17 00:00:00 2001 From: "F. Eugene Aumson" Date: Mon, 22 Jul 2024 15:13:12 +0000 Subject: [PATCH] proto .sh: pull protoc-gen-go version from go.mod addresses review comment https://github.com/ava-labs/awm-relayer/pull/344#discussion_r1678238020 --- proto/pb/decider/v1/decider.pb.go | 8 ++++---- scripts/protobuf_codegen.sh | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/proto/pb/decider/v1/decider.pb.go b/proto/pb/decider/v1/decider.pb.go index 2fdd34e5..90afe12d 100644 --- a/proto/pb/decider/v1/decider.pb.go +++ b/proto/pb/decider/v1/decider.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 +// protoc-gen-go v1.34.2 // protoc (unknown) // source: decider/v1/decider.proto @@ -195,7 +195,7 @@ func file_decider_v1_decider_proto_rawDescGZIP() []byte { } var file_decider_v1_decider_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_decider_v1_decider_proto_goTypes = []interface{}{ +var file_decider_v1_decider_proto_goTypes = []any{ (*ShouldSendMessageRequest)(nil), // 0: decider.v1.ShouldSendMessageRequest (*ShouldSendMessageResponse)(nil), // 1: decider.v1.ShouldSendMessageResponse } @@ -215,7 +215,7 @@ func file_decider_v1_decider_proto_init() { return } if !protoimpl.UnsafeEnabled { - file_decider_v1_decider_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_decider_v1_decider_proto_msgTypes[0].Exporter = func(v any, i int) any { switch v := v.(*ShouldSendMessageRequest); i { case 0: return &v.state @@ -227,7 +227,7 @@ func file_decider_v1_decider_proto_init() { return nil } } - file_decider_v1_decider_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_decider_v1_decider_proto_msgTypes[1].Exporter = func(v any, i int) any { switch v := v.(*ShouldSendMessageResponse); i { case 0: return &v.state diff --git a/scripts/protobuf_codegen.sh b/scripts/protobuf_codegen.sh index d5786892..7f3f0ac7 100755 --- a/scripts/protobuf_codegen.sh +++ b/scripts/protobuf_codegen.sh @@ -7,6 +7,13 @@ if ! [[ "$0" =~ scripts/protobuf_codegen.sh ]]; then exit 255 fi +RELAYER_PATH=$( + cd "$(dirname "${BASH_SOURCE[0]}")" + cd .. && pwd +) + +source $RELAYER_PATH/scripts/versions.sh + ## ensure the correct version of "buf" is installed BUF_VERSION='1.31.0' if [[ $(buf --version | cut -f2 -d' ') != "${BUF_VERSION}" ]]; then @@ -15,7 +22,7 @@ if [[ $(buf --version | cut -f2 -d' ') != "${BUF_VERSION}" ]]; then fi ## install "protoc-gen-go" -PROTOC_GEN_GO_VERSION='v1.33.0' +PROTOC_GEN_GO_VERSION=$(getDepVersion google.golang.org/protobuf) go install -v google.golang.org/protobuf/cmd/protoc-gen-go@${PROTOC_GEN_GO_VERSION} if [[ $(protoc-gen-go --version | cut -f2 -d' ') != "${PROTOC_GEN_GO_VERSION}" ]]; then # e.g., protoc-gen-go v1.28.1