Skip to content

Commit d4dbe8b

Browse files
committed
Update build (GO 1.24)
Merge commit 'd1a8a6723a1a0bc68e0ad06554db79db108f7d33' into update-build-13.03.25-take-2
2 parents 959c3ae + d1a8a67 commit d4dbe8b

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

build/images/build/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ RUN git config --global user.email "bot@presslabs.com" \
9393

9494
# ------------------------------------------------------------------------------------------------
9595
# Go support
96-
RUN GO_VERSION=1.22.2 && \
97-
GO_HASH=5901c52b7a78002aeff14a21f93e0f064f74ce1360fce51c6ee68cd471216a17 && \
96+
RUN GO_VERSION=1.24.0 && \
97+
GO_HASH=dea9ca38a0b852a74e81c26134671af7c0fbe65d81b0dc1c5bfe22cf7d4c8858 && \
9898
curl -fsSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz -o golang.tar.gz && \
9999
echo "${GO_HASH} golang.tar.gz" | sha256sum -c - && \
100100
tar -C /usr/local -xzf golang.tar.gz && \

build/makelib/golang.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ GO_LDFLAGS += -s -w
5858
endif
5959

6060
# supported go versions
61-
GO_SUPPORTED_VERSIONS ?= 1.21|1.22
61+
GO_SUPPORTED_VERSIONS ?= 1.23|1.24
6262

6363
# set GOOS and GOARCH
6464
GOOS := $(OS)
@@ -72,7 +72,7 @@ GOHOSTARCH := $(HOSTARCH)
7272

7373
GO_PACKAGES := $(foreach t,$(GO_SUBDIRS),$(GO_PROJECT)/$(t)/...)
7474
GO_TEST_PACKAGES ?= $(shell go list -f '{{ if or .TestGoFiles .XTestGoFiles }}{{ .ImportPath }}{{ end }}' $(foreach t,$(GO_SUBDIRS),$(GO_PROJECT)/$(t)/...))
75-
GO_INTEGRATION_TEST_PACKAGES ?= $(foreach t,$(GO_INTEGRATION_TESTS_SUBDIRS),$(GO_PROJECT)/$(t)/integration)
75+
GO_INTEGRATION_TEST_PACKAGES ?= $(foreach t,$(GO_INTEGRATION_TESTS_SUBDIRS),$(GO_PROJECT)/$(t))
7676

7777
ifneq ($(GO_TEST_PARALLEL),)
7878
GO_TEST_FLAGS += -p $(GO_TEST_PARALLEL)
@@ -200,7 +200,7 @@ DEP_DOWNLOAD_URL ?= https://github.com/golang/dep/releases/download/v$(DEP_VERSI
200200
$(eval $(call tool.download,dep,$(DEP_VERSION),$(DEP_DOWNLOAD_URL)))
201201
endif
202202

203-
GOLANGCI_LINT_VERSION ?= 1.55.2
203+
GOLANGCI_LINT_VERSION ?= 1.64.6
204204
GOLANGCI_LINT_DOWNLOAD_URL ?= https://github.com/golangci/golangci-lint/releases/download/v$(GOLANGCI_LINT_VERSION)/golangci-lint-$(GOLANGCI_LINT_VERSION)-$(HOSTOS)-$(HOSTARCH).tar.gz
205205
$(eval $(call tool.download.tar.gz,golangci-lint,$(GOLANGCI_LINT_VERSION),$(GOLANGCI_LINT_DOWNLOAD_URL)))
206206

@@ -212,20 +212,20 @@ endif
212212

213213
# we use a consistent version of gofmt even while running different go compilers.
214214
# see https://github.com/golang/go/issues/26397 for more details
215-
GOFMT_VERSION ?= 1.22
215+
GOFMT_VERSION ?= 1.24
216216
GOFMT_DOWNLOAD_URL ?= https://dl.google.com/go/go$(GOFMT_VERSION).$(HOSTOS)-$(HOSTARCH).tar.gz
217217
ifneq ($(findstring $(GOFMT_VERSION),$(GO_VERSION)),)
218218
GOFMT := $(shell which gofmt)
219219
else
220220
$(eval $(call tool.download.tar.gz,gofmt,$(GOFMT_VERSION),$(GOFMT_DOWNLOAD_URL),bin/gofmt))
221221
endif
222222

223-
GOIMPORTS_VERSION ?= v0.20.0
223+
GOIMPORTS_VERSION ?= v0.30.0
224224
GOIMPORTS_URL ?= golang.org/x/tools/cmd/goimports
225225
$(eval $(call tool.go.install,goimports,$(GOIMPORTS_VERSION),$(GOIMPORTS_URL)))
226226

227227
ifeq ($(GO_TEST_TOOL),ginkgo)
228-
GINKGO_VERSION ?= v2.18.0
228+
GINKGO_VERSION ?= v2.22.2
229229
GINKGO_URL ?= github.com/onsi/ginkgo/v2/ginkgo
230230
$(eval $(call tool.go.install,ginkgo,$(GINKGO_VERSION),$(GINKGO_URL)))
231231
else # GO_TEST_TOOL != ginkgo

build/makelib/kubebuilder.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ KUBEBUILDER_DOWNLOAD_URL ?= https://github.com/kubernetes-sigs/kubebuilder/relea
4949
$(eval $(call tool.download,kubebuilder,$(KUBEBUILDER_VERSION),$(KUBEBUILDER_DOWNLOAD_URL)))
5050

5151
# controller-gen download and install
52-
CONTROLLER_GEN_VERSION ?= 0.15.0
52+
CONTROLLER_GEN_VERSION ?= 0.17.1
5353
CONTROLLER_GEN_DOWNLOAD_URL ?= sigs.k8s.io/controller-tools/cmd/controller-gen
5454
$(eval $(call tool.go.install,controller-gen,v$(CONTROLLER_GEN_VERSION),$(CONTROLLER_GEN_DOWNLOAD_URL)))
5555

0 commit comments

Comments
 (0)