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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

klone.yaml

@@ -9,35 +9,35 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
+      repo_hash: 587c086c2847f3d1a6f4814dfd73d9af472a4826
       repo_path: modules/tools

make/_shared/go/01_mod.mk

@@ -20,6 +20,10 @@ ifndef repo_name
 $(error repo_name is not set)
 endif
 
+ifndef golangci_lint_config
+$(error golangci_lint_config is not set)
+endif
+
 golangci_lint_override := $(dir $(lastword $(MAKEFILE_LIST)))/.golangci.override.yaml
 
 .PHONY: go-workspace
@@ -105,7 +109,6 @@ verify-govulncheck: | $(NEEDS_GOVULNCHECK)
 
 endif # govulncheck_skip
 
-ifdef golangci_lint_config
 
 .PHONY: generate-golangci-lint-config
 ## Generate a golangci-lint configuration file
@@ -155,5 +158,3 @@ fix-golangci-lint: | $(NEEDS_GOLANGCI-LINT) $(NEEDS_YQ) $(NEEDS_GCI) $(bin_dir)/
 				popd >/dev/null; \
 				echo ""; \
 			done
-
-endif