From c700630cbb2f5a41e16c346efdfc117015bb595a Mon Sep 17 00:00:00 2001 From: dkrn Date: Wed, 10 Jan 2024 15:37:32 +0000 Subject: [PATCH] fix(conan): allow include_prerelease without argument In Conan 2.x include_prerelease do not have an argument --- lib/modules/versioning/conan/common.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/modules/versioning/conan/common.ts b/lib/modules/versioning/conan/common.ts index 3b5bdb4df095ca..9497d96fc274a9 100644 --- a/lib/modules/versioning/conan/common.ts +++ b/lib/modules/versioning/conan/common.ts @@ -30,7 +30,12 @@ export function makeVersion( export function cleanVersion(version: string): string { if (version) { return version - .replace(regEx(/,|\[|\]|"|include_prerelease=|loose=|True|False/g), '') + .replace( + regEx( + /,|\[|\]|"|include_prerelease=|include_prerelease|loose=|True|False/g, + ), + '', + ) .trim(); } return version; @@ -44,7 +49,7 @@ export function getOptions(input: string): { let loose = true; if (input) { includePrerelease = - input.includes('include_prerelease=True') && + input.includes('include_prerelease') && !input.includes('include_prerelease=False'); loose = input.includes('loose=True') || !input.includes('loose=False'); }