Skip to content

Commit c9ab6b9

Browse files
committed
[FAB-10348] Remove workaround for golint install
Change-Id: I7e5966d516a041d96ba9a9ce9d15818b65d79d49 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
1 parent 2c7de07 commit c9ab6b9

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

gotools.mk

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,10 @@ go.fqp.counterfeiter := github.com/maxbrunsfeld/counterfeiter
1313
go.fqp.gocov := github.com/axw/gocov/gocov
1414
go.fqp.gocov-xml := github.com/AlekSi/gocov-xml
1515
go.fqp.goimports := golang.org/x/tools/cmd/goimports
16-
#-----temporarty workaround for FAB-9667---
17-
#go.fqp.golint := github.com/golang/lint/golint
16+
go.fqp.golint := github.com/golang/lint/golint
17+
go.fqp.manifest-tool := github.com/estesp/manifest-tool
1818
go.fqp.misspell := github.com/client9/misspell/cmd/misspell
1919
go.fqp.mockery := github.com/vektra/mockery/cmd/mockery
20-
go.fqp.manifest-tool := github.com/estesp/manifest-tool
2120

2221
.PHONY: gotools-install
2322
gotools-install: $(patsubst %,$(GOTOOLS_BINDIR)/%, $(GOTOOLS))
@@ -26,11 +25,6 @@ gotools-install: $(patsubst %,$(GOTOOLS_BINDIR)/%, $(GOTOOLS))
2625
gotools-clean:
2726
-@rm -rf $(BUILD_DIR)/gotools
2827

29-
#-----temporarty workaround for FAB-9667---
30-
gotool.golint:
31-
@git clone https://github.com/golang/lint.git $(GOTOOLS_GOPATH)/src/golang.org/x/lint
32-
@GOPATH=$(abspath $(GOTOOLS_GOPATH)) GOBIN=$(abspath $(GOTOOLS_BINDIR)) go install golang.org/x/lint/golint
33-
3428
# Special override for protoc-gen-go since we want to use the version vendored with the project
3529
gotool.protoc-gen-go:
3630
@echo "Building github.com/golang/protobuf/protoc-gen-go -> protoc-gen-go"

0 commit comments

Comments
 (0)