From 402370597d6a9299d8ebb05fc170ac3c49904a63 Mon Sep 17 00:00:00 2001 From: Duco van Amstel Date: Thu, 28 Feb 2019 11:38:14 +0000 Subject: [PATCH] all: remove erroneously added submodule (#813) See also https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module --- Makefile | 4 ++-- go-critic | 1 - go.mod | 3 ++- go.sum | 7 +++++++ tools.go | 10 ++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) delete mode 160000 go-critic create mode 100644 tools.go diff --git a/Makefile b/Makefile index 82d790c0a..2b1e03f3c 100644 --- a/Makefile +++ b/Makefile @@ -26,11 +26,11 @@ ci-tests: ci-linter: curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b ${GOPATH}/bin v1.15.0 golangci-lint run -v - go get github.com/Quasilyte/go-consistent + go install github.com/Quasilyte/go-consistent go-consistent ./... cover: - go get -u github.com/mattn/goveralls + go install github.com/mattn/goveralls goveralls -package github.com/go-critic/go-critic/checkers -coverprofile=coverage.out -service travis-ci -repotoken ${COVERALLS_TOKEN} install: diff --git a/go-critic b/go-critic deleted file mode 160000 index b93735691..000000000 --- a/go-critic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b9373569160643640c0cfa345c5b6c8d549ad36d diff --git a/go.mod b/go.mod index 39e47fd81..ec1cb9885 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,7 @@ module github.com/go-critic/go-critic require ( + github.com/Quasilyte/go-consistent v0.0.0-20181230194409-8f8379e70f99 github.com/go-lintpack/lintpack v0.5.2 github.com/go-toolsmith/astcast v0.0.0-20181028201508-b7a89ed70af1 github.com/go-toolsmith/astcopy v0.0.0-20180903214859-79b422d080c4 @@ -9,6 +10,6 @@ require ( github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30 github.com/go-toolsmith/strparse v0.0.0-20180903215201-830b6daa1241 github.com/go-toolsmith/typep v0.0.0-20181030061450-d63dc7650676 - github.com/mattn/goveralls v0.0.2 // indirect + github.com/mattn/goveralls v0.0.2 golang.org/x/tools v0.0.0-20181205014116-22934f0fdb62 ) diff --git a/go.sum b/go.sum index dbe7eda58..d26e4362f 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +github.com/Quasilyte/go-consistent v0.0.0-20181230194409-8f8379e70f99 h1:1EBYo2g4jmrQYzTN/GXwdkZGDJpMDdygqXq99yllHPM= +github.com/Quasilyte/go-consistent v0.0.0-20181230194409-8f8379e70f99/go.mod h1:ds1OLa3HF2x4OGKCx0pNTVL1s9Ii/2mT0Bg/8PtW6AM= github.com/go-lintpack/lintpack v0.5.2 h1:DI5mA3+eKdWeJ40nU4d6Wc26qmdG8RCi/btYq0TuRN0= github.com/go-lintpack/lintpack v0.5.2/go.mod h1:NwZuYi2nUHho8XEIZ6SIxihrnPoqBTDqfpXvXAN0sXM= github.com/go-toolsmith/astcast v0.0.0-20181028201508-b7a89ed70af1 h1:h+1eMw+tZAlgTVclcVN0/rdPaBI/RUzG0peblT6df+Q= @@ -8,6 +10,8 @@ github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6 h1:aTBUNRTat github.com/go-toolsmith/astequal v0.0.0-20180903214952-dcb477bfacd6/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086 h1:EIMuvbE9fbtQtimdLe5yeXjuC5CeKbQt8zH6GwtIrhM= github.com/go-toolsmith/astfmt v0.0.0-20180903215011-8f8ee99c3086/go.mod h1:mP93XdblcopXwlyN4X4uodxXQhldPGZbcEJIimQHrkg= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21 h1:wP6mXeB2V/d1P1K7bZ5vDUO3YqEzcvOREOxZPEu3gVI= +github.com/go-toolsmith/astinfo v0.0.0-20180906194353-9809ff7efb21/go.mod h1:dDStQCHtmZpYOmjRP/8gHHnCCch3Zz3oEgCdZVdtweU= github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30 h1:zRJPftZJNLPDiOtvYbFRwjSbaJAcVOf80TeEmWGe2kQ= github.com/go-toolsmith/astp v0.0.0-20180903215135-0af7e3c24f30/go.mod h1:SV2ur98SGypH1UjcPpCatrV5hPazG6+IfNHbkDXBRrk= github.com/go-toolsmith/pkgload v0.0.0-20181119091011-e9e65178eee8 h1:vVouagbdmqTVlCIAxpyYsNNTbkKZ3V66VpKOLU/s6W4= @@ -18,10 +22,13 @@ github.com/go-toolsmith/typep v0.0.0-20181030061450-d63dc7650676 h1:6Qrsp0+25KEk github.com/go-toolsmith/typep v0.0.0-20181030061450-d63dc7650676/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e h1:9MlwzLdW7QSDrhDjFlsEYmxpFyIoXmYRon3dt0io31k= github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4= github.com/mattn/goveralls v0.0.2 h1:7eJB6EqsPhRVxvwEXGnqdO2sJI0PTsrWoTMXEk9/OQc= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +golang.org/x/tools v0.0.0-20181024171208-a2dc47679d30/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181117154741-2ddaf7f79a09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181205014116-22934f0fdb62 h1:KRNg63y5nZTd4po+9IAmrqBNARjHSwNMrkRrJj0AViU= golang.org/x/tools v0.0.0-20181205014116-22934f0fdb62/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/tools.go b/tools.go new file mode 100644 index 000000000..4ed3506e7 --- /dev/null +++ b/tools.go @@ -0,0 +1,10 @@ +// +build tools + +package critic + +import ( + // Used for CI linting. + _ "github.com/Quasilyte/go-consistent" + // Used to generate code coverage. + _ "github.com/mattn/goveralls" +)