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.

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

feat: update vendors presets; clean up #882

Merged
merged 2 commits into from
Dec 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: ['local>bfra-me/renovate-config'],
extends: ['github>bfra-me/renovate-config#v2.1.0'],
automergeType: 'pr',
prCreation: 'immediate',
semanticCommitScope: 'deps',
Expand All @@ -10,7 +10,7 @@
},
packageRules: [
{
matchFileNames: ['.github/workflows/**'],
matchFileNames: ['.github/workflows/main.yaml'],
semanticCommitType: 'ci',
},
{
Expand Down Expand Up @@ -67,5 +67,13 @@
'\\snpm install conventional-changelog-conventionalcommits@(?<currentValue>.*?)\\s',
],
},
{
customType: 'regex',
datasourceTemplate: 'npm',
fileMatch: ['^\\.github\\/renovate\\.json5$'],
matchStrings: [
'npx\\s+(?<depName>prettier)(?:@(?<currentValue>\\d+\\.\\d+\\.\\d+))?',
],
},
],
}
2 changes: 1 addition & 1 deletion .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ name: Renovate
default: false

concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: false

permissions: {}
Expand Down
1 change: 1 addition & 0 deletions automerge.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "Use default automerge settings.",
"extends": [
":automergeBranch",
Expand Down
5 changes: 4 additions & 1 deletion default.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,9 @@
"matchRepositories": ["bfra-me/**"]
}
],
"regexManagers": [
"customManagers": [
{
"customType": "regex",
"description": "Update `version` and <*>`_VERSION` values in GitHub Actions and workflows.",
"fileMatch": [
"^action\\.ya?ml$",
Expand All @@ -92,6 +93,7 @@
]
},
{
"customType": "regex",
"description": "Update `install-`<*> Buildpack commands and <*>`_VERSION` values in Dockerfiles.",
"fileMatch": ["(^|/|\\.)Dockerfile$", "(^|/)Dockerfile\\.[^/]*$"],
"matchStrings": [
Expand All @@ -101,6 +103,7 @@
"versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}"
},
{
"customType": "regex",
"description": "Update GitHub Action references in Markdown files.",
"fileMatch": ["\\.md$"],
"matchStrings": [
Expand Down
1 change: 1 addition & 0 deletions group.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "Use default group preset settings.",
"extends": [
"group:linters",
Expand Down
4 changes: 3 additions & 1 deletion maintenance.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"description": "Include default config presets for repository maintenance.",
"extends": [
":rebaseStalePrs",
Expand Down Expand Up @@ -72,7 +73,8 @@
"internal": {
"description": "Internal Renovate configuration for @bfra-me.",
"extends": [
"github>bfra-me/renovate-config:maintenance/pinGitHubActionDigestsToSemver"
"github>bfra-me/renovate-config:maintenance/pinGitHubActionDigestsToSemver#v2.1.0",
"github>bfra-me/renovate-config:vendors/elstudio#v2.1.0"
]
}
}
32 changes: 27 additions & 5 deletions vendors.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
"matchPackageNames": ["bfra-me/renovate-config"]
}
],
"regexManagers": [
"customManagers": [
{
"customType": "regex",
"datasourceTemplate": "github-releases",
"depNameTemplate": "bfra-me/renovate-config",
"fileMatch": [
"^\\.github/renovate\\.json5?$",
"^\\.gitlab/renovate\\.json5?",
"^\\.github\\/renovate\\.json5?$",
"^\\.gitlab\\/renovate\\.json5?$",
"^\\.renovaterc\\.json5?$",
"^\\.renovaterc$",
"^renovate\\.json5?$"
Expand All @@ -49,6 +49,27 @@
]
},

"elstudio": {
"description": "Update @elstudio/actions-settings digests in GitHub actions and workflows.",
"customManagers": [
{
"customType": "regex",
"autoReplaceStringTemplate": "uses: {{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
"datasourceTemplate": "git-refs",
"depTypeTemplate": "action",
"fileMatch": [
"^(workflow-templates|\\.github/(?:workflows|actions))/[^/]+\\.ya?ml$",
"(^|/)action\\.ya?ml$"
],
"matchStrings": [
"uses:\\s+(?<depName>elstudio\\/actions-settings)@(?<currentValue>v3-beta)",
"uses:\\s+(?<depName>elstudio\\/actions-settings)@(?<currentDigest>[a-f0-9]+)"
],
"packageNameTemplate": "https://github.com/elstudio/actions-settings"
}
]
},

"exivity": {
"description": "Update @exivity/actions digests in GitHub actions and workflows.",
"packageRules": [
Expand All @@ -58,8 +79,9 @@
"schedule": ["after 5am on Monday"]
}
],
"regexManagers": [
"customManagers": [
{
"customType": "regex",
"fileMatch": [
"^(workflow-templates|\\.github/(?:workflows|actions))/[^/]+\\.ya?ml$",
"(^|/)action\\.ya?ml$"
Expand Down