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

[CI] Merge self-upgrade into main
cert-manager · Mar 7, 2024 · d1669e5 · d1669e5
2 parents 0a76c2c + 2b51422
commit d1669e5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,40 +10,40 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 1d93410ce1702a34917b72beb64dad24057b2139
+      repo_hash: bfb9591e1ef2c8dc23069f6ecc426d71978739c5
       repo_path: modules/tools
diff --git a/make/_shared/help/help.sh b/make/_shared/help/help.sh
@@ -93,8 +93,10 @@ IFS=$'\n'; for line in $extracted_lines; do
 
     # replace any $(...) with the actual value
     if [[ $target =~ \$\((.*)\) ]]; then
-        target=$(echo -e "$extracted_expansions" | grep "<start-target>${BASH_REMATCH[1]}<end-target>")
-        target=$([[ $target =~ \<start-expansion\>(.*)\<end-expansion\> ]] && echo -e "${BASH_REMATCH[1]}")
+        new_target=$(echo -e "$extracted_expansions" | grep "<start-target>${BASH_REMATCH[1]}<end-target>" || true)
+        if [[ -n "$new_target" ]]; then
+            target=$([[ $new_target =~ \<start-expansion\>(.*)\<end-expansion\> ]] && echo -e "${BASH_REMATCH[1]}")
+        fi
     fi
 
     # Print the target and its multiline comment

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