From 27b358372d71a599633164692561974c79dfe4a0 Mon Sep 17 00:00:00 2001 From: cert-manager-bot Date: Thu, 9 May 2024 16:32:05 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: cert-manager-bot --- klone.yaml | 26 +++++++++++++------------- make/_shared/tools/00_mod.mk | 12 +++++++++--- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/klone.yaml b/klone.yaml index 279f63bd..53819dbe 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,65 +10,65 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/cert-manager - folder_name: controller-gen repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/controller-gen - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/generate-verify - folder_name: go repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/go - folder_name: helm repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/helm - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/help - folder_name: kind repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/kind - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/klone - folder_name: oci-build repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/oci-build - folder_name: oci-publish repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/oci-publish - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: c112512ba05d8a5b09ba5e997fd9db8cbb79f154 + repo_hash: 7f6ae2a9f6de1aad0bb32b0cd89ca43989d0d6dd repo_path: modules/tools diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index ada7c784..b986e641 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -361,8 +361,8 @@ $(call for_each_kv,go_dependency,$(go_dependencies)) go_linux_amd64_SHA256SUM=8920ea521bad8f6b7bc377b4824982e011c19af27df88a815e3586ea895f1b36 go_linux_arm64_SHA256SUM=6c33e52a5b26e7aa021b94475587fce80043a727a54ceb0eee2f9fc160646434 -go_darwin_amd64_SHA256SUM=dd5b9303f612379caebfd12eb19e6cadee653b300443eac3a5aca341b05ad7e9 -go_darwin_arm64_SHA256SUM=58d2838f28631038ed5583c5aefb73ea4e5b13040983df21c647880f4f7dd381 +go_darwin_amd64_SHA256SUM=610e48c1df4d2f852de8bc2e7fd2dc1521aac216f0c0026625db12f67f192024 +go_darwin_arm64_SHA256SUM=02abeab3f4b8981232237ebd88f0a9bad933bc9621791cd7720a9ca29eacbe9d .PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools @@ -615,6 +615,12 @@ tools: $(tools_paths) self_file := $(dir $(lastword $(MAKEFILE_LIST)))/00_mod.mk +# see https://stackoverflow.com/a/53408233 +sed_inplace := sed -i'' +ifeq ($(HOST_OS),darwin) + sed_inplace := sed -i '' +endif + # This target is used to learn the sha256sum of the tools. It is used only # in the makefile-modules repo, and should not be used in any other repo. .PHONY: tools-learn-sha @@ -635,5 +641,5 @@ tools-learn-sha: | $(bin_dir) HOST_OS=darwin HOST_ARCH=arm64 $(MAKE) vendor-go while read p; do \ - sed -i "$$p" $(self_file); \ + $(sed_inplace) "$$p" $(self_file); \ done <"$(LEARN_FILE)"