10BC0 Merge pull request #7563 from SgtCoDFish/release-1.17-bumpgo · cert-manager/cert-manager@bec3f95 · GitHub
[go: up one dir, main page]

Skip to content

Commit bec3f95

Browse files
Merge pull request #7563 from SgtCoDFish/release-1.17-bumpgo
[release-1.17] Bump go to v1.23.6
2 parents 4562b9a + a79a663 commit bec3f95

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

make/_shared/klone/01_mod.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
generate-klone: | $(NEEDS_KLONE)
1919
$(KLONE) sync
2020

21-
shared_generate_targets += generate-klone
21+
# MANUAL CHANGE!
22+
# generate-klone is removed so we can manually update versions
23+
# and diverge from upstream klone
24+
# shared_generate_targets += generate-klone
2225

2326
.PHONY: upgrade-klone
2427
## Upgrade klone Makefile modules to latest version

make/_shared/tools/00_mod.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ ADDITIONAL_TOOLS ?=
161161
tools += $(ADDITIONAL_TOOLS)
162162

163163
# https://go.dev/dl/
164-
VENDORED_GO_VERSION := 1.23.5
164+
# NOTE: The version of Go here has been manually updated!
165+
VENDORED_GO_VERSION := 1.23.6
165166

166167
# Print the go version which can be used in GH actions
167168
.PHONY: print-go-version
@@ -380,10 +381,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
380381
# File downloads #
381382
##################
382383

383-
go_linux_amd64_SHA256SUM=cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
384-
go_linux_arm64_SHA256SUM=47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0
385-
go_darwin_amd64_SHA256SUM=d8b310b0b6bd6a630307579165cfac8a37571483c7d6804a10dd73bbefb0827f
386-
go_darwin_arm64_SHA256SUM=047bfce4fbd0da6426bd30cd19716b35a466b1c15a45525ce65b9824acb33285
384+
go_linux_amd64_SHA256SUM=9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d
385+
go_linux_arm64_SHA256SUM=561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202
386+
go_darwin_amd64_SHA256SUM=782da50ce8ec5e98fac2cd3cdc6a1d7130d093294fc310038f651444232a3fb0
387+
go_darwin_arm64_SHA256SUM=5cae2450a1708aeb0333237a155640d5562abaf195defebc4306054565536221
387388

388389
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
389390
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools

0 commit comments

Comments
 (0)
0