Skip to content

Commit

Permalink
Fix hack/golint to use correct image
Browse files Browse the repository at this point in the history
  • Loading branch information
furkatgofurov7 committed May 3, 2021
1 parent 7eef9a4 commit 2c81b19
Show file tree
Hide file tree
Showing 6 changed files with 363 additions and 327 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ release-binary: $(RELEASE_DIR)
-e GOARCH=$(GOARCH) \
-v "$$(pwd):/workspace" \
-w /workspace \
golang:1.15.3 \
golang:1.16 \
go build -a -ldflags '-extldflags "-static"' \
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)

Expand Down Expand Up @@ -532,4 +532,4 @@ verify-boilerplate:
verify-modules: modules
@if !(git diff --quiet HEAD -- go.sum go.mod hack/tools/go.mod hack/tools/go.sum); then \
echo "go module files are out of date"; exit 1; \
fi
fi
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ replace github.com/go-logr/zapr => github.com/go-logr/zapr v0.2.0

replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29

replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
replace github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.4.0
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1119,3 +1119,5 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
4 changes: 2 additions & 2 deletions hack/golint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ else
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/cluster-api-provider-metal3 \
registry.hub.docker.com/library/golang:1.16 \
/go/src/github.com/metal3-io/cluster-api-provider-metal3/hack/gofmt.sh
fi;
/go/src/github.com/metal3-io/cluster-api-provider-metal3/hack/golint.sh
fi;
25 changes: 4 additions & 21 deletions hack/tools/go.mod
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
module sigs.k8s.io/cluster-api/hack/tools

go 1.15
go 1.16

require (
github.com/drone/envsubst v1.0.3-0.20200804185402-58bc65f69603 // indirect
github.com/golang/mock v1.4.3
github.com/golangci/golangci-lint v1.17.1
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e // indirect
github.com/golangci/golangci-lint v1.38.0
github.com/jteeuwen/go-bindata v3.0.7+incompatible
k8s.io/code-generator v0.20.2
k8s.io/klog v1.0.0 // indirect
sigs.k8s.io/controller-tools v0.5.0
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect
sigs.k8s.io/kustomize/kustomize/v3 v3.10.0
sigs.k8s.io/testing_frameworks v0.1.1
)

replace (
// TODO(vincepri) Remove the following replace directives, needed for golangci-lint until
// https://github.com/golangci/golangci-lint/issues/595 is fixed.
github.com/go-critic/go-critic v0.0.0-20181204210945-1df300866540 => github.com/go-critic/go-critic v0.0.0-20190526074819-1df300866540
github.com/golangci/errcheck v0.0.0-20181003203344-ef45e06d44b6 => github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6
github.com/golangci/go-tools v0.0.0-20180109140146-af6baa5dc196 => github.com/golangci/go-tools v0.0.0-20190318060251-af6baa5dc196
github.com/golangci/gofmt v0.0.0-20181105071733-0b8337e80d98 => github.com/golangci/gofmt v0.0.0-20181222123516-0b8337e80d98
github.com/golangci/gosec v0.0.0-20180901114220-66fb7fc33547 => github.com/golangci/gosec v0.0.0-20190211064107-66fb7fc33547
github.com/golangci/ineffassign v0.0.0-20180808204949-42439a7714cc => github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc
github.com/golangci/lint-1 v0.0.0-20180610141402-ee948d087217 => github.com/golangci/lint-1 v0.0.0-20190420132249-ee948d087217
github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190714144026-65da19158fa2
mvdan.cc/unparam v0.0.0-20190124213536-fbb59629db34 => mvdan.cc/unparam v0.0.0-20190209190245-fbb59629db34
)
Loading

0 comments on commit 2c81b19

Please sign in to comment.