Skip to content

Commit 16f1dc3

Browse files
cert-manager-botcert-manager-bot
committed
BOT: run 'make upgrade-klone' and 'make generate'
Signed-off-by: cert-manager-bot <[email protected]>
1 parent ae14ab1 commit 16f1dc3

File tree

8 files changed

+12
-32
lines changed

8 files changed

+12
-32
lines changed

‎.github/renovate.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/renovate.json5 instead.
2+
// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/renovate.json5 instead.
33

44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ jobs:
109109
owner,
110110
repo,
111111
issue_number: result.data.number,
112-
labels: ['ok-to-test', 'skip-review']
112+
labels: ['ok-to-test', 'skip-review', 'release-note-none', 'kind/cleanup']
113113
});
114114
}

‎.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/workflows/renovate.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/workflows/renovate.yaml instead.
33

44
name: Renovate
55
on:

‎klone.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
13+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
1414
repo_path: modules/boilerplate
1515
- folder_name: generate-verify
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
18+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
1919
repo_path: modules/generate-verify
2020
- folder_name: help
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
23+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
2424
repo_path: modules/help
2525
- folder_name: klone
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
28+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
2929
repo_path: modules/klone
3030
- folder_name: repository-base
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
33+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
3434
repo_path: modules/repository-base
3535
- folder_name: tools
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 217b9616a01c901044098e5ae0c285ae3b1223ac
38+
repo_hash: 7ae1a17b704245a7a847c31f44b39ea6c60d000a
3939
repo_path: modules/tools

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ $(error repo_name is not set)
1717
endif
1818

1919
repository_base_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base/
20-
repository_base_dependabot_dir := $(dir $(lastword $(MAKEFILE_LIST)))/base-dependabot/
2120

22-
ifdef repository_base_no_dependabot
2321
.PHONY: generate-base
2422
## Generate base files in the repository
2523
## @category [shared] Generate/ Verify
@@ -29,23 +27,5 @@ generate-base:
2927
find . -type f | while read file; do \
3028
sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
3129
done
32-
else
33-
.PHONY: generate-base
34-
## Generate base files in the repository
35-
## @category [shared] Generate/ Verify
36-
generate-base:
37-
# TODO(erikgb): Remove; just a temporary command to clean out Dependabot files
38-
rm -f ./.github/dependabot.yaml
39-
cp -r $(repository_base_dir)/. ./
40-
cd $(repository_base_dir) && \
41-
find . -type f | while read file; do \
42-
sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
43-
done
44-
cp -r $(repository_base_dependabot_dir)/. ./
45-
cd $(repository_base_dependabot_dir) && \
46-
find . -type f | while read file; do \
47-
sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
48-
done
49-
endif
5030

5131
shared_generate_targets += generate-base

‎make/_shared/repository-base/base-dependabot/.github/renovate.json5‎ renamed to ‎make/_shared/repository-base/base/.github/renovate.json5‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/renovate.json5 instead.
2+
// Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/renovate.json5 instead.
33

44
{
55
$schema: 'https://docs.renovatebot.com/renovate-schema.json',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,6 @@ jobs:
109109
owner,
110110
repo,
111111
issue_number: result.data.number,
112-
labels: ['ok-to-test', 'skip-review']
112+
labels: ['ok-to-test', 'skip-review', 'release-note-none', 'kind/cleanup']
113113
});
114114
}

‎make/_shared/repository-base/base-dependabot/.github/workflows/renovate.yaml‎ renamed to ‎make/_shared/repository-base/base/.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
2-
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base-dependabot/.github/workflows/renovate.yaml instead.
2+
# Edit https://github.com/cert-manager/makefile-modules/blob/main/modules/repository-base/base/.github/workflows/renovate.yaml instead.
33

44
name: Renovate
55
on:

0 commit comments

Comments
 (0)