Merge pull request #6937 from inteon/upgrade_repository-base

Upgrade repository-base module and disable dependabot

.github/workflows/make-self-upgrade.yaml

@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build_images:
+  self_upgrade:
     runs-on: ubuntu-latest
 
     permissions:

klone.yaml

@@ -35,7 +35,7 @@ targets:
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 04f424fa90aa8ca570278cf0c07b18dea607b542
+      repo_hash: e9363accaaee20a995bbf8f1c9cba2ea77da8935
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git

make/00_mod.mk

@@ -56,3 +56,5 @@ GOLDFLAGS := -w -s \
     -X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=$(GITCOMMIT)
 
 golangci_lint_config := .golangci.yaml
+
+repository_base_no_dependabot := 1

make/_shared/repository-base/01_mod.mk

@@ -13,11 +13,21 @@
 # limitations under the License.
 
 base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
+base_dependabot_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base-dependabot/
 
+ifdef repository_base_no_dependabot
 .PHONY: generate-base
 ## Generate base files in the repository
 ## @category [shared] Generate/ Verify
 generate-base:
 	cp -r $(base_dir)/. ./
+else
+.PHONY: generate-base
+## Generate base files in the repository
+## @category [shared] Generate/ Verify
+generate-base:
+	cp -r $(base_dir)/. ./
+	cp -r $(base_dependabot_dir)/. ./
+endif
 
 shared_generate_targets += generate-base

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

@@ -1,20 +0,0 @@
-# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/dependabot.yaml instead.
-
-# Update Go dependencies and GitHub Actions dependencies daily.
-version: 2
-updates:
-- package-ecosystem: gomod
-  directory: /
-  schedule:
-    interval: daily
-  groups:
-    all:
-      patterns: ["*"]
-- package-ecosystem: github-actions
-  directory: /
-  schedule:
-    interval: daily
-  groups:
-    all:
-      patterns: ["*"]

make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml

@@ -9,7 +9,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  build_images:
+  self_upgrade:
     runs-on: ubuntu-latest
 
     permissions: