Skip to content

Commit

Permalink
feat: enable platform automerge when enabling automerge (#1107)
Browse files Browse the repository at this point in the history
  • Loading branch information
marcusrbrown authored Nov 29, 2024
1 parent e349ad2 commit 1e89cb5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
matchPackageNames: [
'conventional-changelog-conventionalcommits',
'semantic-release',
'semantic-release-export-data',
],
semanticCommitType: 'build',
},
Expand All @@ -34,13 +35,13 @@
matchDepTypes: ['action'],
commitMessageTopic: '{{depName}}',
rangeStrategy: 'pin',
updatePinnedDependencies: false,
},
{
matchFileNames: ['**/*.md'],
addLabels: ['automerge'],
additionalBranchPrefix: 'docs-',
automerge: true,
platformAutomerge: true,
commitMessageTopic: 'references to {{depName}}',
minimumReleaseAge: null,
pinDigests: false,
Expand Down
1 change: 1 addition & 0 deletions automerge.json5
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
automerge: true,
platformAutomerge: true,
addLabels: ['automerge'],
}
3 changes: 3 additions & 0 deletions internal.json5
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,15 @@
matchUpdateTypes: ['digest', 'patch', 'pinDigest'],
addLabels: ['automerge'],
automerge: true,
platformAutomerge: true,
},
{
description: 'Automerge `minor` and `patch` update types (except unstable versions, e.g., `0.x`).',
matchCurrentVersion: '!/^v?0/',
matchUpdateTypes: ['minor', 'patch'],
addLabels: ['automerge'],
automerge: true,
platformAutomerge: true,
},
{
description: 'Automerge GitHub Actions as PRs.',
Expand All @@ -128,6 +130,7 @@
matchUpdateTypes: ['minor', 'patch'],
addLabels: ['automerge'],
automerge: true,
platformAutomerge: true,
dependencyDashboardApproval: false,
},
{
Expand Down
1 change: 1 addition & 0 deletions maintenance.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"enabled": true,
"addLabels": ["automerge", "scheduled"],
"automerge": true,
"platformAutomerge": true,
"rebaseWhen": "behind-base-branch",
"schedule": ["before 3am on Monday"],
"prBodyDefinitions": {
Expand Down

0 comments on commit 1e89cb5

Please sign in to comment.