Skip to content

Commit

Permalink
Merge pull request #552 from haircommander/golangci-lint-1.19.1
Browse files Browse the repository at this point in the history
  Download golangci-lint via wget
  • Loading branch information
k8s-ci-robot authored Nov 7, 2019
2 parents bc50b06 + 2018721 commit f8a6b3d
Show file tree
Hide file tree
Showing 1,013 changed files with 144 additions and 201,941 deletions.
10 changes: 3 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
dist: xenial

go:
- 1.12.x
- 1.13.x

env:
- GOPROXY=https://proxy.golang.org
Expand Down Expand Up @@ -31,18 +31,14 @@ before_install:
install:
- make install.tools
- make install.ginkgo

jobs:
include:
- stage: Static check
os: linux
script:
- make lint
- hack/verify-go-modules.sh
- stage: Static check
os: linux-ppc64le
script:
- make install.lint
- make lint
- hack/verify-go-modules.sh
- stage: Build
Expand Down
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,18 @@ lint: $(GOLANGCI_LINT)
$(GOLANGCI_LINT) run
./hack/repo-infra/verify/verify-boilerplate.sh

install.tools: $(GOLANGCI_LINT) $(GINKGO)
install.tools: install.lint install.ginkgo

install.ginkgo: $(GINKGO)
install.lint: $(GOLANGCI_LINT)

$(GOLANGCI_LINT):
$(call go-build,./vendor/github.com/golangci/golangci-lint/cmd/golangci-lint)
export \
VERSION=v1.21.0 \
URL=https://raw.githubusercontent.com/golangci/golangci-lint \
BINDIR=${BUILD_BIN_PATH} && \
curl -sfL $$URL/$$VERSION/install.sh | sh -s $$VERSION


$(GINKGO):
$(call go-build,./vendor/github.com/onsi/ginkgo/ginkgo)
Expand Down
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/ghodss/yaml v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.3.2
github.com/golangci/golangci-lint v1.17.1
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/opencontainers/go-digest v1.0.0-rc1
Expand All @@ -18,7 +17,7 @@ require (
github.com/sirupsen/logrus v1.4.2
github.com/urfave/cli v1.22.1
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/sys v0.0.0-20190730183949-1393eb018365
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
google.golang.org/grpc v1.23.0
gopkg.in/yaml.v2 v2.2.2
k8s.io/api v0.0.0
Expand Down
144 changes: 2 additions & 142 deletions go.sum

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ limitations under the License.
package tools

import (
_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
_ "github.com/onsi/ginkgo/ginkgo"
)
5 changes: 0 additions & 5 deletions vendor/github.com/BurntSushi/toml/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/github.com/BurntSushi/toml/.travis.yml

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/BurntSushi/toml/COMPATIBLE

This file was deleted.

21 changes: 0 additions & 21 deletions vendor/github.com/BurntSushi/toml/COPYING

This file was deleted.

19 changes: 0 additions & 19 deletions vendor/github.com/BurntSushi/toml/Makefile

This file was deleted.

218 changes: 0 additions & 218 deletions vendor/github.com/BurntSushi/toml/README.md

This file was deleted.

Loading

0 comments on commit f8a6b3d

Please sign in to comment.