Skip to content

Commit a8d3742

Browse files
castrojoCopilot
andauthored
fix(renovate): align config with org standard — extend shared config, automerge digests (#790)
Dakota's renovate config was extending config:recommended instead of the org's local>projectbluefin/renovate-config. It also didn't automerge 'digest' type updates (SHA pins are digest type), causing drift. Changes: - Extends local>projectbluefin/renovate-config (gets org rules) - Adds digest to automerge matchUpdateTypes - Adds projectbluefin/actions grouping rule (atomic SHA PRs) - Preserves enabledManagers: github-actions (BST sources tracked separately) - Preserves bonedigger exclusion Resolves: projectbluefin/common#605 Assisted-by: Claude Sonnet 4 via pi Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 8f9cc82 commit a8d3742

1 file changed

Lines changed: 19 additions & 11 deletions

File tree

.github/renovate.json5

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:recommended",
4+
"local>projectbluefin/renovate-config:org-inherited-config"
55
],
66
// Renovate targets main. All PRs must target main — the CI gate
77
// (on-pr-opened-or-updated) blocks any PR not targeting main.
88
// Note: track-bst-sources.yml manages BuildStream refs directly and
99
// intentionally targets main — it is not Renovate-managed.
1010
"baseBranchPatterns": ["main"],
1111
"branchPrefix": "renovate/",
12-
"schedule": ["* 0-3 * * 1"],
1312

1413
// Limit Renovate to GitHub Actions and workflow image refs.
1514
// BuildStream sources are tracked separately by track-bst-sources.yml.
1615
"enabledManagers": ["github-actions"],
1716

18-
// Do not rebase when the default branch is updated
19-
"rebaseWhen": "never",
20-
2117
"packageRules": [
2218
{
19+
"description": "Automerge digest/pin/patch/minor when CI passes",
20+
"matchUpdateTypes": ["digest", "pin", "patch", "minor"],
21+
"automerge": true,
22+
"automergeType": "pr",
23+
"automergeStrategy": "squash"
24+
},
25+
{
26+
"description": "Group all projectbluefin/actions SHA updates into one atomic PR",
27+
"matchManagers": ["github-actions"],
28+
"matchDepNames": ["/projectbluefin\/actions/"],
29+
"groupName": "projectbluefin/actions",
30+
"automerge": true,
31+
"automergeType": "pr",
32+
"automergeStrategy": "squash",
33+
"labels": ["chore/deps", "automerge"]
34+
},
35+
{
36+
"description": "Pin all GitHub Actions to full SHA digests",
2337
"matchManagers": ["github-actions"],
2438
"matchDepTypes": ["action"],
2539
"pinDigests": true
@@ -29,12 +43,6 @@
2943
// See .github/workflows/bonedigger.yml and docs/skills/ci-tooling.md.
3044
"matchPackageNames": ["projectbluefin/bonedigger"],
3145
"enabled": false
32-
},
33-
{
34-
"automerge": true,
35-
"matchManagers": ["github-actions"],
36-
"matchDepTypes": ["action"],
37-
"matchUpdateTypes": ["minor", "patch"]
3846
}
3947
]
4048
}

0 commit comments

Comments
 (0)