Skip to content

Commit

Permalink
[FAB-12440] disable goimports in linting
Browse files Browse the repository at this point in the history
Change-Id: I41a19a79089e1bf8682e376836759b1a9eb61552
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
  • Loading branch information
sykesm committed Oct 16, 2018
1 parent 126a7ed commit 1e11372
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion gotools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ GOTOOLS_BIN = $(patsubst %,$(GOBIN)/%, $(GOTOOLS))

# go tool->path mapping
go.fqp.govendor := github.com/kardianos/govendor
go.fqp.golint := github.com/golang/lint/golint
go.fqp.golint := golang.org/x/lint/golint
go.fqp.goimports := golang.org/x/tools/cmd/goimports
go.fqp.ginkgo := github.com/onsi/ginkgo/ginkgo
go.fqp.gocov := github.com/axw/gocov/...
Expand Down
7 changes: 0 additions & 7 deletions scripts/golinter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,4 @@ for i in "${arr[@]}"
do
echo "Checking $i"
go vet $i/...
OUTPUT="$(goimports -srcdir $GOPATH/src/github.com/hyperledger/fabric -l $i)"
if [[ $OUTPUT ]]; then
echo "The following files contain goimports errors"
echo $OUTPUT
echo "The goimports command must be run for these files"
exit 1
fi
done

0 comments on commit 1e11372

Please sign in to comment.