From 74f1833a27fa88a7870b77026c0af73b26c19d6f Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Thu, 9 May 2024 19:35:16 -1000 Subject: [PATCH] feat(preset): update dockerfileVersions match string (#28963) --- lib/config/presets/internal/regex-managers.spec.ts | 10 ++++++++++ lib/config/presets/internal/regex-managers.ts | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/config/presets/internal/regex-managers.spec.ts b/lib/config/presets/internal/regex-managers.spec.ts index ed954a1146052a..d43fccbf71749c 100644 --- a/lib/config/presets/internal/regex-managers.spec.ts +++ b/lib/config/presets/internal/regex-managers.spec.ts @@ -138,6 +138,9 @@ describe('config/presets/internal/regex-managers', () => { # renovate: datasource=npm depName=pnpm ENV PNPM_VERSION="7.25.1" + # renovate: datasource=npm depName=pnpm + ENV PNPM_VERSION='7.25.1' + # renovate: datasource=npm depName=yarn ENV YARN_VERSION 3.3.1 @@ -172,6 +175,13 @@ describe('config/presets/internal/regex-managers', () => { replaceString: '# renovate: datasource=npm depName=pnpm\nENV PNPM_VERSION="7.25.1"\n', }, + { + currentValue: '7.25.1', + datasource: 'npm', + depName: 'pnpm', + replaceString: + "# renovate: datasource=npm depName=pnpm\nENV PNPM_VERSION='7.25.1'\n", + }, { currentValue: '3.3.1', datasource: 'npm', diff --git a/lib/config/presets/internal/regex-managers.ts b/lib/config/presets/internal/regex-managers.ts index 26999d940d7938..6d772d39debe06 100644 --- a/lib/config/presets/internal/regex-managers.ts +++ b/lib/config/presets/internal/regex-managers.ts @@ -39,7 +39,7 @@ export const presets: Record = { '(^|/)([Dd]ocker|[Cc]ontainer)file[^/]*$', ], matchStrings: [ - '# renovate: datasource=(?[a-z-.]+?) depName=(?[^\\s]+?)(?: (lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[^\\s]+?))?(?: extractVersion=(?[^\\s]+?))?(?: registryUrl=(?[^\\s]+?))?\\s(?:ENV|ARG) .+?_VERSION[ =]"?(?.+?)"?\\s', + '# renovate: datasource=(?[a-z-.]+?) depName=(?[^\\s]+?)(?: (lookupName|packageName)=(?[^\\s]+?))?(?: versioning=(?[^\\s]+?))?(?: extractVersion=(?[^\\s]+?))?(?: registryUrl=(?[^\\s]+?))?\\s(?:ENV|ARG)\\s+[A-Za-z0-9_]+?_VERSION[ =]["\']?(?.+?)["\']?\\s', ], }, ],