Skip to content

Commit 8f7d6c0

Browse files
committed
Replace self-upgrade workflow with Renovate JSONata manager
Signed-off-by: Erik Godding Boye <egboye@gmail.com>
1 parent d9a39cc commit 8f7d6c0

4 files changed

Lines changed: 31 additions & 129 deletions

File tree

modules/repository-base/01_mod.mk

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,11 @@ repository_base_dir := $(_repository_base_module_dir)base/
2424
## @category [shared] Generate/ Verify
2525
generate-base:
2626
cp -r $(repository_base_dir)/. ./
27-
cd $(repository_base_dir) && \
28-
find . -type f | while read file; do \
29-
sed "s|{{REPLACE:GH-REPOSITORY}}|$(repo_name:github.com/%=%)|g" "$$file" > "$(CURDIR)/$$file"; \
30-
done
3127
if [ ! -e ./.github/renovate.json5 ]; then \
3228
mkdir -p ./.github; \
3329
cp $(_repository_base_module_dir)/renovate-bootstrap-config.json5 ./.github/renovate.json5; \
3430
fi
31+
# TODO: Remove when all downstream repos are updated
32+
rm -f ./.github/chainguard/make-self-upgrade.sts.yaml ./.github/workflows/make-self-upgrade.yaml
3533

3634
shared_generate_targets += generate-base

modules/repository-base/base/.github/chainguard/make-self-upgrade.sts.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

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

Lines changed: 0 additions & 114 deletions
This file was deleted.

renovate-config.json5

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,36 @@
33
extends: [
44
'github>cert-manager/renovate-config:default.json5',
55
],
6+
"customManagers": [
7+
{
8+
"customType": "jsonata",
9+
"fileFormat": "yaml",
10+
"managerFilePatterns": ["klone.yaml"],
11+
"matchStrings": [
12+
'targets.*.{\
13+
"datasource": "git-refs",\
14+
"versioning": "git",\
15+
"depName": folder_name,\
16+
"packageName": repo_url,\
17+
"currentValue": repo_ref,\
18+
"currentDigest": repo_hash\
19+
}',
20+
]
21+
}
22+
],
623
packageRules: [
24+
{
25+
"groupName": 'Makefile Modules',
26+
"matchManagers": ["custom.jsonata"],
27+
"matchFileNames": ["klone.yaml"],
28+
"postUpgradeTasks": {
29+
"commands": [
30+
"make vendor-go",
31+
"make generate-klone",
32+
"make generate"
33+
],
34+
}
35+
},
736
{
837
matchFileNames: [
938
'**/go.mod',
@@ -22,6 +51,5 @@
2251
// Exclude files that are sourced from makefile-modules and shouldn't be upgraded in projects using makefile-modules.
2352
'make/_shared/**',
2453
'.github/workflows/govulncheck.yaml',
25-
'.github/workflows/make-self-upgrade.yaml',
2654
],
2755
}

0 commit comments

Comments
 (0)