Skip to content

Commit

Permalink
[FAB-10348] Remove workaround for golint install
Browse files Browse the repository at this point in the history
Change-Id: I7e5966d516a041d96ba9a9ce9d15818b65d79d49
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
  • Loading branch information
sykesm committed May 24, 2018
1 parent 2c7de07 commit c9ab6b9
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions gotools.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ go.fqp.counterfeiter := github.com/maxbrunsfeld/counterfeiter
go.fqp.gocov := github.com/axw/gocov/gocov
go.fqp.gocov-xml := github.com/AlekSi/gocov-xml
go.fqp.goimports := golang.org/x/tools/cmd/goimports
#-----temporarty workaround for FAB-9667---
#go.fqp.golint := github.com/golang/lint/golint
go.fqp.golint := github.com/golang/lint/golint
go.fqp.manifest-tool := github.com/estesp/manifest-tool
go.fqp.misspell := github.com/client9/misspell/cmd/misspell
go.fqp.mockery := github.com/vektra/mockery/cmd/mockery
go.fqp.manifest-tool := github.com/estesp/manifest-tool

.PHONY: gotools-install
gotools-install: $(patsubst %,$(GOTOOLS_BINDIR)/%, $(GOTOOLS))
Expand All @@ -26,11 +25,6 @@ gotools-install: $(patsubst %,$(GOTOOLS_BINDIR)/%, $(GOTOOLS))
gotools-clean:
-@rm -rf $(BUILD_DIR)/gotools

#-----temporarty workaround for FAB-9667---
gotool.golint:
@git clone https://github.com/golang/lint.git $(GOTOOLS_GOPATH)/src/golang.org/x/lint
@GOPATH=$(abspath $(GOTOOLS_GOPATH)) GOBIN=$(abspath $(GOTOOLS_BINDIR)) go install golang.org/x/lint/golint

# Special override for protoc-gen-go since we want to use the version vendored with the project
gotool.protoc-gen-go:
@echo "Building github.com/golang/protobuf/protoc-gen-go -> protoc-gen-go"
Expand Down

0 comments on commit c9ab6b9

Please sign in to comment.