Merge pull request #383 from cert-manager/self-upgrade-main

[CI] Merge self-upgrade-main into main
cert-manager · Jul 15, 2024 · ef5428c · ef5428c
2 parents 8fec2fb + c764df5
commit ef5428c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 45 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,70 +10,70 @@ targets:
     - folder_name: api-docs
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/api-docs
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 140169ff41d87878ddb0fdfd5ecf567aee25d992
+      repo_hash: 7458086828acec84648afb1beb18da8a7d0e5e3c
       repo_path: modules/tools
diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
@@ -616,34 +616,3 @@ endif
 ## Download and setup all tools
 ## @category [shared] Tools
 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
-tools-learn-sha: | $(bin_dir)
-	rm -rf ./$(bin_dir)/
-	mkdir -p ./$(bin_dir)/scratch/
-	$(eval export LEARN_FILE=$(CURDIR)/$(bin_dir)/scratch/learn_tools_file)
-	echo -n "" > "$(LEARN_FILE)"
-
-	HOST_OS=linux HOST_ARCH=amd64 $(MAKE) tools
-	HOST_OS=linux HOST_ARCH=arm64 $(MAKE) tools
-	HOST_OS=darwin HOST_ARCH=amd64 $(MAKE) tools
-	HOST_OS=darwin HOST_ARCH=arm64 $(MAKE) tools
-
-	HOST_OS=linux HOST_ARCH=amd64 $(MAKE) vendor-go
-	HOST_OS=linux HOST_ARCH=arm64 $(MAKE) vendor-go
-	HOST_OS=darwin HOST_ARCH=amd64 $(MAKE) vendor-go
-	HOST_OS=darwin HOST_ARCH=arm64 $(MAKE) vendor-go
-
-	while read p; do \
-		$(sed_inplace) "$$p" $(self_file); \
-	done <"$(LEARN_FILE)"