Skip to content
Snippets Groups Projects
Unverified Commit b02f7233 authored by Sebastian Poxhofer's avatar Sebastian Poxhofer Committed by GitHub
Browse files

feat(presets): allow dots in regexManager presets (#24001)

parent ba8c2bab
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,9 @@ describe('config/presets/internal/regex-managers', () => { ...@@ -20,6 +20,9 @@ describe('config/presets/internal/regex-managers', () => {
# renovate: datasource=npm depName=yarn # renovate: datasource=npm depName=yarn
ENV YARN_VERSION 3.3.1 ENV YARN_VERSION 3.3.1
# renovate: datasource=custom.hashicorp depName=consul
ENV CONSUL_VERSION 1.3.1
RUN echo "FOO" RUN echo "FOO"
`; `;
...@@ -52,6 +55,13 @@ describe('config/presets/internal/regex-managers', () => { ...@@ -52,6 +55,13 @@ describe('config/presets/internal/regex-managers', () => {
replaceString: replaceString:
'# renovate: datasource=npm depName=yarn\nENV YARN_VERSION 3.3.1\n', '# renovate: datasource=npm depName=yarn\nENV YARN_VERSION 3.3.1\n',
}, },
{
currentValue: '1.3.1',
datasource: 'custom.hashicorp',
depName: 'consul',
replaceString:
'# renovate: datasource=custom.hashicorp depName=consul\nENV CONSUL_VERSION 1.3.1\n',
},
]); ]);
}); });
...@@ -88,6 +98,8 @@ describe('config/presets/internal/regex-managers', () => { ...@@ -88,6 +98,8 @@ describe('config/presets/internal/regex-managers', () => {
PNPM_VERSION: "7.25.1" PNPM_VERSION: "7.25.1"
# renovate: datasource=npm depName=yarn # renovate: datasource=npm depName=yarn
YARN_VERSION: '3.3.1' YARN_VERSION: '3.3.1'
# renovate: datasource=custom.hashicorp depName=consul
CONSUL_VERSION: 1.3.1
jobs: jobs:
lint: lint:
...@@ -130,6 +142,13 @@ describe('config/presets/internal/regex-managers', () => { ...@@ -130,6 +142,13 @@ describe('config/presets/internal/regex-managers', () => {
replaceString: replaceString:
"# renovate: datasource=npm depName=yarn\n YARN_VERSION: '3.3.1'\n", "# renovate: datasource=npm depName=yarn\n YARN_VERSION: '3.3.1'\n",
}, },
{
currentValue: '1.3.1',
datasource: 'custom.hashicorp',
depName: 'consul',
replaceString:
'# renovate: datasource=custom.hashicorp depName=consul\n CONSUL_VERSION: 1.3.1\n',
},
]); ]);
}); });
......
...@@ -12,7 +12,7 @@ export const presets: Record<string, Preset> = { ...@@ -12,7 +12,7 @@ export const presets: Record<string, Preset> = {
'(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$', '(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$',
], ],
matchStrings: [ matchStrings: [
'# renovate: datasource=(?<datasource>[a-z-]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV|ARG) .+?_VERSION[ =]"?(?<currentValue>.+?)"?\\s', '# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))?\\s(?:ENV|ARG) .+?_VERSION[ =]"?(?<currentValue>.+?)"?\\s',
], ],
}, },
], ],
...@@ -24,7 +24,7 @@ export const presets: Record<string, Preset> = { ...@@ -24,7 +24,7 @@ export const presets: Record<string, Preset> = {
{ {
fileMatch: ['^.github/(?:workflows|actions)/.+\\.ya?ml$'], fileMatch: ['^.github/(?:workflows|actions)/.+\\.ya?ml$'],
matchStrings: [ matchStrings: [
'# renovate: datasource=(?<datasource>[a-z-]+?) depName=(?<depName>[^\\s]+?)(?: (?:lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*["\']?(?<currentValue>.+?)["\']?\\s', '# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:lookupName|packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[a-z-0-9]+?))?\\s+[A-Za-z0-9_]+?_VERSION\\s*:\\s*["\']?(?<currentValue>.+?)["\']?\\s',
], ],
}, },
], ],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment