Merge pull request #19395 from tamird/megacheck

build: move {metacheck,unconvert} into style_test
cockroachdb · Oct 21, 2017 · 2c9a884 · 2c9a884
2 parents b87e3be + b507634
commit 2c9a884
Show file tree

Hide file tree

Showing 28 changed files with 517 additions and 426 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -9,7 +9,6 @@ required = [
  "github.com/jteeuwen/go-bindata/go-bindata",
  "github.com/kisielk/errcheck",
  "github.com/mattn/goveralls",
- "github.com/mdempsky/unconvert",
  "github.com/mibk/dupl",
  "github.com/wadey/gocovmerge",
  "golang.org/x/perf/cmd/benchstat",

diff --git a/build/common.mk b/build/common.mk
@@ -164,7 +164,7 @@ $(BOOTSTRAP_TARGET): $(GITHOOKS) $(REPO_ROOT)/Gopkg.lock
 ifneq ($(GIT_DIR),)
 	git submodule update --init
 endif
-	@$(GO_INSTALL) -v $(PKG_ROOT)/cmd/{metacheck,returncheck} \
+	@$(GO_INSTALL) -v $(PKG_ROOT)/cmd/returncheck \
 		$(REPO_ROOT)/vendor/github.com/golang/dep/cmd/dep \
 		$(REPO_ROOT)/vendor/github.com/client9/misspell/cmd/misspell \
 		$(REPO_ROOT)/vendor/github.com/cockroachdb/crlfmt \
@@ -175,7 +175,6 @@ endif
 		$(REPO_ROOT)/vendor/github.com/jteeuwen/go-bindata/go-bindata \
 		$(REPO_ROOT)/vendor/github.com/kisielk/errcheck \
 		$(REPO_ROOT)/vendor/github.com/mattn/goveralls \
-		$(REPO_ROOT)/vendor/github.com/mdempsky/unconvert \
 		$(REPO_ROOT)/vendor/github.com/mibk/dupl \
 		$(REPO_ROOT)/vendor/github.com/wadey/gocovmerge \
 		$(REPO_ROOT)/vendor/golang.org/x/perf/cmd/benchstat \