Skip to content

Commit

Permalink
proto: update proto name and remove conflictPolicy (#1085)
Browse files Browse the repository at this point in the history
  • Loading branch information
lichunzhu authored Nov 1, 2021
1 parent bb0d31f commit c032e8b
Show file tree
Hide file tree
Showing 3 changed files with 127 additions and 153 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ TEST_DIR := /tmp/tidb_binlog_test

GO := GO111MODULE=on go
GOBUILD := CGO_ENABLED=0 $(GO) build $(BUILD_FLAG)
# TODO: Remove this ldflags. It is used to fix unit tests temporarily. See https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict.
GOTEST := CGO_ENABLED=1 $(GO) test -p 1 -ldflags "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn"
GOTEST := CGO_ENABLED=1 $(GO) test -p 1
GOVERSION := "`go version`"

ARCH := "`uname -s`"
Expand All @@ -28,8 +27,6 @@ FILES := $$(find . -name '*.go' -type f | grep -vE 'vendor' | grep -vE 'binlog.p
LDFLAGS += -X "github.com/pingcap/tidb-binlog/pkg/version.BuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')"
LDFLAGS += -X "github.com/pingcap/tidb-binlog/pkg/version.GitHash=$(shell git rev-parse HEAD)"
LDFLAGS += -X "github.com/pingcap/tidb-binlog/pkg/version.ReleaseVersion=$(shell git describe --tags --dirty)"
# TODO: Remove this ldflags. See https://developers.google.com/protocol-buffers/docs/reference/go/faq#namespace-conflict.
LDFLAGS += -X "google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn"

default: build buildsucc

Expand Down
Loading

0 comments on commit c032e8b

Please sign in to comment.