Skip to content

Commit 90da153

Browse files
committed
revert unrelated changes
1 parent 6baebf6 commit 90da153

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Makefile

+10-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RPM_VERSION ?= $(DEB_VERSION)
3232
RPM_REVISION ?= 0
3333

3434
# used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below
35+
# update this only by running `make update-golang-version`
3536
GO_VERSION ?= 1.16.7
3637

3738
# replace "x.y.0" => "x.y". kube-cross and golang.org/dl use different formats for x.y.0 go versions
@@ -66,7 +67,8 @@ MINIKUBE_UPLOAD_LOCATION := gs://${MINIKUBE_BUCKET}
6667
MINIKUBE_RELEASES_URL=https://github.com/kubernetes/minikube/releases/download
6768

6869
KERNEL_VERSION ?= 4.19.182
69-
# latest from https://github.com/golangci/golangci-lint/releases
70+
# latest from https://github.com/golangci/golangci-lint/releases
71+
# update this only by running `make update-golint-version`
7072
GOLINT_VERSION ?= v1.41.1
7173
# Limit number of default jobs, to avoid the CI builds running out of memory
7274
GOLINT_JOBS ?= 4
@@ -973,6 +975,12 @@ update-kubernetes-version:
973975
(cd hack/update/kubernetes_version && \
974976
go run update_kubernetes_version.go)
975977

978+
.PHONY: update-golint-version
979+
update-golint-version:
980+
(cd hack/update/golint_version && \
981+
go run update_golint_version.go)
982+
983+
976984
.PHONY: update-kubernetes-version-pr
977985
update-kubernetes-version-pr:
978986
ifndef GITHUB_TOKEN
@@ -1003,4 +1011,4 @@ time-to-k8s-benchmark:
10031011
.PHONY: update-gopogh-version
10041012
update-gopogh-version: ## update gopogh version
10051013
(cd hack/update/gopogh_version && \
1006-
go run update_gopogh_version.go)
1014+
go run update_gopogh_version.go)

0 commit comments

Comments
 (0)