Skip to content

Commit

Permalink
Merge pull request #510 from BenTheElder/correct-golint
Browse files Browse the repository at this point in the history
use canonical golint
  • Loading branch information
BenTheElder authored May 9, 2019
2 parents d9f8b03 + 7590458 commit 046b0ac
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ require (
github.com/go-openapi/spec v0.17.2 // indirect
github.com/go-openapi/swag v0.17.2 // indirect
github.com/gogo/protobuf v1.1.1 // indirect
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf
github.com/google/uuid v1.1.1
github.com/googleapis/gnostic v0.2.0 // indirect
Expand All @@ -25,7 +24,7 @@ require (
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.2 // indirect
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7 // indirect
golang.org/x/lint v0.0.0-20180702182130-06c8688daad7
golang.org/x/tools v0.0.0-20180911133044-677d2ff680c1 // indirect
gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ github.com/go-openapi/swag v0.17.2 h1:K/ycE/XTUDFltNHSO32cGRUhrVGJD64o8WgAIZNyc3
github.com/go-openapi/swag v0.17.2/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg=
github.com/gogo/protobuf v1.1.1 h1:72R+M5VuhED/KujmZVcIquuo8mBgX4oVda//DQb3PXo=
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7 h1:2hRPrmiwPrp3fQX967rNJIhQPtiGXdlQWAxKbKw3VHA=
github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package tools

import (
// linter(s)
_ "github.com/golang/lint/golint"
_ "golang.org/x/lint"

// for packing binary data
_ "github.com/jteeuwen/go-bindata/go-bindata"
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-golint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ export GO111MODULE="on"
GOPROXY="${GOPROXY:-https://proxy.golang.org}"
export GOPROXY

go run github.com/golang/lint/golint -set_exit_status ./pkg/... ./cmd/... .
go run golang.org/x/lint/golint -set_exit_status ./pkg/... ./cmd/... .

0 comments on commit 046b0ac

Please sign in to comment.