Merge pull request #45 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main
cert-manager · Apr 17, 2024 · f3bfb31 · f3bfb31
2 parents 07a3a74 + 531ecfe
commit f3bfb31
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 17 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,45 +10,45 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 2b3ed7d6563ecd61de7d5f3b95a0efb4462ba110
+      repo_hash: 39f02d7046ae188051809cdfbbd5e32fc6488429
       repo_path: modules/tools
diff --git a/make/_shared/go/01_mod.mk b/make/_shared/go/01_mod.mk
@@ -57,20 +57,14 @@ verify-govulncheck: | $(NEEDS_GOVULNCHECK)
 
 ifdef golangci_lint_config
 
-# see https://stackoverflow.com/a/53408233
-sed_inplace := sed -i''
-ifeq ($(HOST_OS),darwin)
-	sed_inplace := sed -i ''
-endif
-
 .PHONY: generate-golangci-lint-config
 ## Generate a golangci-lint configuration file
 ## @category [shared] Generate/ Verify
 generate-golangci-lint-config: | $(NEEDS_YQ) $(bin_dir)/scratch
 	cp $(golangci_lint_config) $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	$(YQ) -i 'del(.linters.enable)' $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	$(YQ) eval-all -i '. as $$item ireduce ({}; . * $$item)' $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_override)
-	$(sed_inplace) 's|{{REPO-NAME}}|$(repo_name)|g' $(bin_dir)/scratch/golangci-lint.yaml.tmp
+	$(YQ) -i '(.. | select(tag == "!!str")) |= sub("{{REPO-NAME}}", "$(repo_name)")' $(bin_dir)/scratch/golangci-lint.yaml.tmp
 	mv $(bin_dir)/scratch/golangci-lint.yaml.tmp $(golangci_lint_config)
 
 shared_generate_targets += generate-golangci-lint-config

diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk
@@ -134,7 +134,7 @@ ADDITIONAL_TOOLS ?=
 TOOLS += $(ADDITIONAL_TOOLS)
 
 # https://go.dev/dl/
-VENDORED_GO_VERSION := 1.21.8
+VENDORED_GO_VERSION := 1.21.9
 
 # Print the go version which can be used in GH actions
 .PHONY: print-go-version