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

[CI] Merge self-upgrade-main into main

Author: cert-manager-prow[bot]

.github/dependabot.yaml

@@ -9,12 +9,12 @@ updates:
   schedule:
     interval: daily
   groups:
-    all:
+    all-go-deps:
       patterns: ["*"]
 - package-ecosystem: github-actions
   directory: /
   schedule:
     interval: daily
   groups:
-    all:
+    all-gh-actions:
       patterns: ["*"]

Makefile

@@ -39,7 +39,7 @@
 # For details on some of these "prelude" settings, see:
 # https://clarkgrubb.com/makefile-style-guide
 MAKEFLAGS += --warn-undefined-variables --no-builtin-rules
-SHELL := /usr/bin/env bash
+SHELL := /usr/bin/env PS1="" bash
 .SHELLFLAGS := -uo pipefail -c
 .DEFAULT_GOAL := help
 .DELETE_ON_ERROR:

klone.yaml

@@ -10,65 +10,65 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/cert-manager
     - folder_name: controller-gen
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/controller-gen
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/go
     - folder_name: helm
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/helm
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/help
     - folder_name: kind
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/kind
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/klone
     - folder_name: oci-build
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/oci-build
     - folder_name: oci-publish
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/oci-publish
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 96603dabe6b58f2d14455995dc78e932c841195a
+      repo_hash: cf7f45d0a649834f3a8906ffef411bce03d09ac5
       repo_path: modules/tools

make/_shared/repository-base/base-dependabot/.github/dependabot.yaml

@@ -9,12 +9,12 @@ updates:
   schedule:
     interval: daily
   groups:
-    all:
+    all-go-deps:
       patterns: ["*"]
 - package-ecosystem: github-actions
   directory: /
   schedule:
     interval: daily
   groups:
-    all:
+    all-gh-actions:
       patterns: ["*"]

make/_shared/repository-base/base/Makefile

@@ -39,7 +39,7 @@
 # For details on some of these "prelude" settings, see:
 # https://clarkgrubb.com/makefile-style-guide
 MAKEFLAGS += --warn-undefined-variables --no-builtin-rules
-SHELL := /usr/bin/env bash
+SHELL := /usr/bin/env PS1="" bash
 .SHELLFLAGS := -uo pipefail -c
 .DEFAULT_GOAL := help
 .DELETE_ON_ERROR: