From 83deeb4dd0b08c3886670ec50345c0ed4cd7c1f0 Mon Sep 17 00:00:00 2001
From: Erik Godding Boye <egboye@gmail.com>
Date: Thu, 4 Sep 2025 21:52:40 +0200
Subject: [PATCH] Cleanup Dependabot leftovers

Signed-off-by: Erik Godding Boye <egboye@gmail.com>
---
 modules/repository-base/01_mod.mk             | 20 -------------------
 .../.github/renovate.json5                    |  2 +-
 .../.github/workflows/renovate.yaml           |  2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)
 rename modules/repository-base/{base-dependabot => base}/.github/renovate.json5 (98%)
 rename modules/repository-base/{base-dependabot => base}/.github/workflows/renovate.yaml (96%)

diff --git a/modules/repository-base/01_mod.mk b/modules/repository-base/01_mod.mk
index 7ba5061c..0d094c23 100644
--- a/modules/repository-base/01_mod.mk
+++ b/modules/repository-base/01_mod.mk
@@ -17,9 +17,7 @@ $(error repo_name is not set)
 endif
 
 repository_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
-repository_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
@@ -29,23 +27,5 @@ generate-base:
 		find . -type f | while read file; do \
 			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
 		done
-else
-.PHONY: generate-base
-## Generate base files in the repository
-## @category [shared] Generate/ Verify
-generate-base:
-	# TODO(erikgb): Remove; just a temporary command to clean out Dependabot files
-	rm -f ./.github/dependabot.yaml
-	cp -r $(repository_base_dir)/. ./
-	cd $(repository_base_dir) && \
-		find . -type f | while read file; do \
-			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
-		done
-	cp -r $(repository_base_dependabot_dir)/. ./
-	cd $(repository_base_dependabot_dir) && \
-		find . -type f | while read file; do \
-			sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
-		done
-endif
 
 shared_generate_targets += generate-base
diff --git a/modules/repository-base/base-dependabot/.github/renovate.json5 b/modules/repository-base/base/.github/renovate.json5
similarity index 98%
rename from modules/repository-base/base-dependabot/.github/renovate.json5
rename to modules/repository-base/base/.github/renovate.json5
index de3cb67d..e728d688 100644
--- a/modules/repository-base/base-dependabot/.github/renovate.json5
+++ b/modules/repository-base/base/.github/renovate.json5
@@ -1,5 +1,5 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/renovate.json5 instead.
+// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/renovate.json5 instead.
 
 {
   $schema: 'https://docs.renovatebot.com/renovate-schema.json',
diff --git a/modules/repository-base/base-dependabot/.github/workflows/renovate.yaml b/modules/repository-base/base/.github/workflows/renovate.yaml
similarity index 96%
rename from modules/repository-base/base-dependabot/.github/workflows/renovate.yaml
rename to modules/repository-base/base/.github/workflows/renovate.yaml
index e9074196..006f58df 100644
--- a/modules/repository-base/base-dependabot/.github/workflows/renovate.yaml
+++ b/modules/repository-base/base/.github/workflows/renovate.yaml
@@ -1,5 +1,5 @@
 # THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
-# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/workflows/renovate.yaml instead.
+# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/workflows/renovate.yaml instead.
 
 name: Renovate
 on: