Skip to content

Commit b329e8e

Browse files
committed
Renovate: Minor updates, automerges
1 parent 12ebb45 commit b329e8e

4 files changed

Lines changed: 22 additions & 3 deletions

File tree

.github/renovate.json5

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
':enablePreCommit',
88
':semanticCommits',
99
':automergeBranch',
10+
'helpers:pinGitHubActionDigests',
1011
'github>wrmilling/k3s-gitops//.github/renovate/automerge-github-actions.json',
1112
'github>wrmilling/k3s-gitops//.github/renovate/commit-message.json',
1213
'github>wrmilling/k3s-gitops//.github/renovate/pr-labels.json',
@@ -25,8 +26,10 @@
2526
dependencyDashboardTitle: 'Renovate (Mend) Dashboard',
2627
suppressNotifications: [
2728
'prIgnoreNotification',
29+
'prEditedNotification',
2830
],
29-
rebaseWhen: 'conflicted',
31+
rebaseWhen: 'auto',
32+
platformAutomerge: true,
3033
commitBodyTable: true,
3134
platformCommit: 'enabled',
3235
gitAuthor: 'Winston R. Milling <wrmilling@users.noreply.github.com>',

.github/renovate/autoMerge.json5

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
{
2-
"packageRules": [ ]
2+
"packageRules": [
3+
{
4+
"description": "Auto-merge container digest updates overnight",
5+
"matchDatasources": ["docker"],
6+
"automerge": true,
7+
"automergeType": "pr",
8+
"schedule": ["after 1am and before 5am"],
9+
"matchUpdateTypes": ["digest"]
10+
}
11+
]
312
}

.github/renovate/custom-managers.json5

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
{
55
customType: "regex",
66
description: "Process various dependencies in YAML files",
7-
fileMatch: ["\\.ya?ml(\\.j2)?$"],
7+
fileMatch: ["\\.ya?ml(\\.j2)?$", "(^|/).+\\.env$", "(^|/).+\\.sh$"],
88
matchStrings: [
9+
// datasource= depName= annotation above an assignment (YAML, env, shell)
10+
'datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( repository=(?<registryUrl>\\S+))?\\n.+(:\\s|=)(&\\S+\\s)?(?<currentValue>\\S+)',
911
// Inline
1012
'\\S+: "?(?<currentValue>[^"\\s]+)"? # ?renovate: depName=(?<depName>\\S+)( datasource=(?<datasource>\\S+))?( versioning=(?<versioning>\\S+))?( extractVersion=(?<extractVersion>\\S+))?',
1113
// Newline

.github/renovate/semantic-commits.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343
"matchManagers": ["github-actions"],
4444
"semanticCommitType": "ci",
4545
"semanticCommitScope": "github-action"
46+
},
47+
{
48+
"matchDatasources": ["github-releases"],
49+
"semanticCommitScope": "github-release",
50+
"commitMessageTopic": "release {{depName}}"
4651
}
4752
]
4853
}

0 commit comments

Comments
 (0)