diff --git a/.gitignore b/.gitignore index e636bfbe6..9de2d95c7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,4 @@ bin/ y.go *.output .idea/ -go.mod -go.sum coverage.txt diff --git a/go.mod1 b/go.mod similarity index 95% rename from go.mod1 rename to go.mod index fac7aa1a4..285d9582d 100644 --- a/go.mod1 +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/pingcap/tipb v0.0.0-20190428032612-535e1abaa330 github.com/pkg/errors v0.8.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect - github.com/sirupsen/logrus v1.3.0 + github.com/sirupsen/logrus v1.2.0 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 ) diff --git a/go.sum1 b/go.sum similarity index 96% rename from go.sum1 rename to go.sum index 67a9924b8..2aca77c7c 100644 --- a/go.sum1 +++ b/go.sum @@ -28,8 +28,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 h1:HQagqIiBmr8YXawX/le3+O26N+vPPC1PtjaF3mwnook= github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= -github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= diff --git a/test.sh b/test.sh index 5aa2786a4..e6988a06c 100644 --- a/test.sh +++ b/test.sh @@ -1,11 +1 @@ -{ - mv go.mod1 go.mod - mv go.sum1 go.sum - GO111MODULE=on go test -p 1 -race -covermode=atomic -coverprofile=coverage.txt -coverpkg=./... ./... -} || { - mv go.mod go.mod1 - mv go.sum go.sum1 -} - -mv go.mod go.mod1 -mv go.sum go.sum1 +GO111MODULE=on go test -p 1 -race -covermode=atomic -coverprofile=coverage.txt -coverpkg=./... ./...