Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: clean up nested extends and missing /default sub-presets #972

Merged
merged 1 commit into from
Feb 23, 2024
Merged

fix: clean up nested extends and missing /default sub-presets #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@
},
{
matchFileNames: ['**/*.md'],
extends: ['schedule:weekly', 'github>bfra-me/renovate-config:automerge'],
extends: [
'schedule:weekly',
'github>bfra-me/renovate-config:automerge.json5',
],
additionalBranchPrefix: 'docs-',
commitMessageTopic: 'references to {{{depName}}}',
semanticCommitType: 'docs',
Expand Down
24 changes: 13 additions & 11 deletions automerge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "Enable automerge for Renovate updates.",
"automerge": true,
"addLabels": ["automerge"],
"azureAutoApprove": true,
"gitLabAutomerge": true,
"gitLabIgnoreApprovals": true,
"assignAutomerge": false,
"assigneesFromCodeOwners": false,
"dependencyDashboardApproval": false,
"reviewersFromCodeOwners": false
"extends": ["github>bfra-me/renovate-config:automerge.json5"],
"default": {
"description": "Use default automerge settings.",
"extends": [
"github>bfra-me/renovate-config:automergeNonMajorUpdates.json5"
],
"automergeStrategy": "squash",
"automergeType": "branch",
"ignoreTests": false
},
"enable": {
"extends": ["github>bfra-me/renovate-config:automerge.json5"]
}
}
11 changes: 11 additions & 0 deletions automerge.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"automerge": true,
"addLabels": ["automerge"],
"azureAutoApprove": true,
"gitLabAutomerge": true,
"gitLabIgnoreApprovals": true,
"assignAutomerge": false,
"assigneesFromCodeOwners": false,
"dependencyDashboardApproval": false,
"reviewersFromCodeOwners": false
}
14 changes: 14 additions & 0 deletions automergeNonMajorUpdates.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
description: 'Automerge all update types except `major` and unstable (`0.x.x`) versions.',
packageRules: [
{
matchUpdateTypes: ['patch', 'pin', 'digest'],
extends: ['github>bfra-me/renovate-config:automerge.json5'],
},
{
matchUpdateTypes: ['minor'],
matchCurrentVersion: '!/^0\\./',
extends: ['github>bfra-me/renovate-config:automerge.json5'],
},
],
}
2 changes: 1 addition & 1 deletion default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
":semanticCommits",
":automergeRequireAllStatusChecks",
"mergeConfidence:age-confidence-badges",
"github>bfra-me/renovate-config:replacements",
"github>bfra-me/renovate-config:replacements.json5",
"github>bfra-me/renovate-config:vendors/bfra.me"
],

Expand Down
2 changes: 1 addition & 1 deletion internal.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
extends: [
'github>bfra-me/renovate-config:group/default',
'github>bfra-me/renovate-config:maintenance/security',
'github>bfra-me/renovate-config:maintenance/automergeNonMajorUpdates',
'github>bfra-me/renovate-config:automergeNonMajorUpdates.json5',
'github>bfra-me/renovate-config:maintenance/weeklyLockFileUpdates',
'github>bfra-me/renovate-config:maintenance/dashboardApprovalForMajorUpdates',
'github>bfra-me/renovate-config:maintenance/pinGitHubActionDigestsToSemver',
Expand Down
42 changes: 29 additions & 13 deletions maintenance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,7 @@
},

"automergeNonMajorUpdates": {
"description": "Automerge all update types except `major` and unstable (`0.x.x`) versions.",
"packageRules": [
{
"matchUpdateTypes": ["patch", "pin", "digest"],
"extends": ["github>bfra-me/renovate-config:automerge"]
},
{
"matchUpdateTypes": ["minor"],
"matchCurrentVersion": "!/^0\\./",
"extends": ["github>bfra-me/renovate-config:automerge"]
}
]
"extends": ["github>bfra-me/renovate-config:automerge.json5"]
},

"dashboardApprovalForMajorUpdates": {
Expand All @@ -46,6 +35,33 @@
]
},

"default": {
"description": "Include default config presets for repository maintenance.",
"extends": [
":rebaseStalePrs",
":prNotPending",
":prHourlyLimitNone",
":updateNotScheduled",
"github>bfra-me/renovate-config:maintenance/security"
],
"addLabels": ["dependencies"],

"configMigration": true,
"configWarningReuseIssue": false,

"dependencyDashboardTitle": "Renovate Dashboard",

"prConcurrentLimit": 5,
"recreateClosed": true,

"assigneesFromCodeOwners": true,
"assigneesSampleSize": 1,
"reviewersFromCodeOwners": true,
"reviewersSampleSize": 1,

"timezone": "America/Phoenix"
},

"internal": {
"extends": ["github>bfra-me/renovate-config:internal.json5"]
},
Expand Down Expand Up @@ -80,7 +96,7 @@
"prBodyDefinitions": {
"Change": "All lock files updated (every Monday before 6 AM)"
},
"extends": ["github>bfra-me/renovate-config:automerge"]
"extends": ["github>bfra-me/renovate-config:automerge.json5"]
}
}
}
32 changes: 1 addition & 31 deletions replacements.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,3 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "Use @bfra-me replacements config presets.",

"extends": [
"github>bfra-me/renovate-config:replacements/_eslint-plugin-node-to-eslint-plugin-n",
"github>bfra-me/renovate-config:replacements/_zeit-ncc-to-vercel-ncc"
],

"_eslint-plugin-node-to-eslint-plugin-n": {
"description": "The `eslint-plugin-node` package is now maintained by the fork `eslint-plugin-n`.",
"packageRules": [
{
"matchDatasources": ["npm"],
"matchPackageNames": ["eslint-plugin-node"],
"replacementName": "eslint-plugin-n",
"replacementVersion": "14.0.0"
}
]
},

"_zeit-ncc-to-vercel-ncc": {
"description": "The `@zeit/ncc` package has been renamed to `@vercel/ncc`.",
"packageRules": [
{
"matchDatasources": ["npm"],
"matchPackageNames": ["@zeit/ncc"],
"replacementName": "@vercel/ncc",
"replacementVersion": "0.23.0"
}
]
}
"default": {"extends": ["github>bfra-me/renovate-presets:replacements.json5"]}
}
20 changes: 20 additions & 0 deletions replacements.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
description: 'Use @bfra-me replacements config presets.',
packageRules: [
{
description: 'The `eslint-plugin-node` package is now maintained by the fork `eslint-plugin-n`.',
matchDatasources: ['npm'],
matchPackageNames: ['eslint-plugin-node'],
replacementName: 'eslint-plugin-n',
replacementVersion: '14.0.0',
},
{
description: 'The `@zeit/ncc` package has been renamed to `@vercel/ncc`.',
matchDatasources: ['npm'],
matchPackageNames: ['@zeit/ncc'],
replacementName: '@vercel/ncc',
replacementVersion: '0.23.0',
},
],
}
4 changes: 3 additions & 1 deletion vendors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"default": {"extends": ["github>bfra-me/renovate-config:vendors/bfra.me"]},

"bfra.me+actions": {
"description": "All @bfra-me GitHub actions and reusable workflows.",
"packageRules": {
Expand Down Expand Up @@ -26,7 +28,7 @@
},
{
"description": "Exclude broken versions of the `bfra-me/renovate-config` preset.",
"allowedVersions": ">=3.0.2",
"allowedVersions": ">=3.0.5",
"matchDepNames": ["bfra-me/renovate-config"]
}
],
Expand Down