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

fix mod #107

Merged
merged 1 commit into from
Nov 6, 2018
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 3 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,14 @@ LDFLAGS += -X "github.com/pingcap/tidb-tools/pkg/utils.BuildTS=$(shell date -u '
LDFLAGS += -X "github.com/pingcap/tidb-tools/pkg/utils.GitHash=$(shell git rev-parse HEAD)"

CURDIR := $(shell pwd)
GO := GO15VENDOREXPERIMENT="1" go
GO := GO111MODULE=on go
GOTEST := CGO_ENABLED=1 $(GO) test -p 3
PACKAGES := $$(go list ./... | grep -vE 'vendor')
FILES := $$(find . -name '*.go' -type f | grep -vE 'vendor')
VENDOR_TIDB := vendor/github.com/pingcap/tidb


build: prepare check test importer checker dump_region binlogctl sync_diff_inspector

prepare:
mv go.mod1 go.mod
mv go.sum1 go.sum
GO111MODULE=on go mod vendor
build: check test importer checker dump_region binlogctl sync_diff_inspector

importer:
$(GO) build -ldflags '$(LDFLAGS)' -o bin/importer ./importer
Expand Down Expand Up @@ -62,11 +57,4 @@ check:
#@echo "golint"
#@ golint ./... 2>&1 | grep -vE '\.pb\.go' | grep -vE 'vendor' | awk '{print} END{if(NR>0) {exit 1}}'
@echo "gofmt (simplify)"
@ gofmt -s -l -w $(FILES) 2>&1 | awk '{print} END{if(NR>0) {exit 1}}'

update:
make vendor

vendor:
$(GO) mod vendor
sh ./hack/clean_vendor.sh
@ gofmt -s -l -w $(FILES) 2>&1 | awk '{print} END{if(NR>0) {exit 1}}'
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion importer/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"math"
"strconv"

_ "github.com/go-sql-driver/mysql"
_ "github.com/go-sql-driver/mysql" // for mysql driver
"github.com/juju/errors"
"github.com/pingcap/parser/mysql"
log "github.com/sirupsen/logrus"
Expand Down
1 change: 1 addition & 0 deletions importer/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/pingcap/parser"
"github.com/pingcap/parser/ast"
"github.com/pingcap/parser/types"
_ "github.com/pingcap/tidb/types/parser_driver" // for parser driver
log "github.com/sirupsen/logrus"
)

Expand Down
1 change: 1 addition & 0 deletions pkg/check/privilege.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"github.com/pingcap/parser"
"github.com/pingcap/parser/ast"
"github.com/pingcap/tidb-tools/pkg/dbutil"
_ "github.com/pingcap/tidb/types/parser_driver" // for parser driver
)

/*****************************************************/
Expand Down
1 change: 1 addition & 0 deletions pkg/dbutil/table.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/pingcap/tidb/infoschema"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/types"
_ "github.com/pingcap/tidb/types/parser_driver" // for parser driver
)

// GetTableInfoWithRowID returns table information with _tidb_rowid column if useRowID is true
Expand Down
1 change: 1 addition & 0 deletions tidb-binlog/driver/example/mysql/mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/pingcap/parser/ast"
"github.com/pingcap/tidb-tools/tidb-binlog/driver/reader"
pb "github.com/pingcap/tidb-tools/tidb-binlog/slave_binlog_proto/go-binlog"
_ "github.com/pingcap/tidb/types/parser_driver" // for parser driver
log "github.com/sirupsen/logrus"
)

Expand Down
14 changes: 0 additions & 14 deletions vendor/github.com/BurntSushi/toml/COPYING

This file was deleted.

Loading