Merge pull request #1669 from cert-manager/self-upgrade-master

[CI] Merge self-upgrade-master into master

Author: cert-manager-prow[bot]

klone.yaml

@@ -10,30 +10,30 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/boilerplate
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 75dd712efe2c789e1414062ad710b5f2a7731a13
+      repo_hash: 17f1b472676a6d4e5a8d3b05367cd42a520b4b04
       repo_path: modules/tools

make/_shared/generate-verify/util/verify.sh

@@ -44,7 +44,17 @@ cleanup() {
 }
 trap "cleanup" EXIT SIGINT
 
-rsync -aEq "${projectdir}/." "${tmp}" --exclude "_bin/"
+# Why not just "cp" to the tmp dir?
+# A dumb "cp" will fail sometimes since _bin can get changed while it's being copied if targets are run in parallel,
+# and cp doesn't have some universal "exclude" option to ignore "_bin"
+#
+# We previously used "rsync" here, but:
+# 1. That's another tool we need to depend on
+# 2. rsync on macOS 15.4 and newer is actually openrsync, which has different permissions and throws errors when copying git objects
+#
+# So, we use find to list all files except _bin, and then copy each in turn
+find . -maxdepth 1 -not \( -path "./_bin" \) -not \( -path "." \) | xargs -I% cp -af "${projectdir}/%" "${tmp}/"
+
 pushd "${tmp}" >/dev/null
 
 "$@"