diff --git a/lib/modules/datasource/conan/common.ts b/lib/modules/datasource/conan/common.ts index e0dfa211ddd5009be11b37d544408e936cc0985e..c17062a5995b3a9144c538f8137f0ff085f2c74f 100644 --- a/lib/modules/datasource/conan/common.ts +++ b/lib/modules/datasource/conan/common.ts @@ -6,7 +6,7 @@ export const defaultRegistryUrl = 'https://center.conan.io/'; export const datasource = 'conan'; export const conanDatasourceRegex = regEx( - /(?<name>[a-z\-_0-9]+)\/(?<version>[^@/\n]+)(?<userChannel>@\S+\/\S+)/gim, + /(?<name>[a-zA-Z\-_0-9]+)\/(?<version>[^@/\n]+)(?<userChannel>@\S+\/\S+)/gim, ); export function getConanPackage(packageName: string): ConanPackage { diff --git a/lib/modules/manager/conan/__fixtures__/conanfile.txt b/lib/modules/manager/conan/__fixtures__/conanfile.txt index fb8a66eab42492bd60872b869895096c01cd0fce..b3efed121026559ec68da2e47bc6b23251f5f50b 100644 --- a/lib/modules/manager/conan/__fixtures__/conanfile.txt +++ b/lib/modules/manager/conan/__fixtures__/conanfile.txt @@ -4,6 +4,7 @@ zlib/[~1.2.3, loose=False] fake/8.62.134@test/dev cairo/1.17.2#aff2d03608351db075ec1348a3afc9ff cairo/1.17.2@_/_#aff2d03608351db075ec1348a3afc9ff +Fake/8.62.134@ [build_requires] 7zip/[>1.1 <2.1, include_prerelease=True] diff --git a/lib/modules/manager/conan/extract.spec.ts b/lib/modules/manager/conan/extract.spec.ts index b0df8a12a5f8782fd3d2944dc29222758acb01f3..783c74fbdc7e30f239001b298b494f268375a392 100644 --- a/lib/modules/manager/conan/extract.spec.ts +++ b/lib/modules/manager/conan/extract.spec.ts @@ -55,6 +55,13 @@ describe('modules/manager/conan/extract', () => { packageName: 'cairo/1.17.2@_/_', replaceString: 'cairo/1.17.2@_/_#aff2d03608351db075ec1348a3afc9ff', }, + { + currentValue: '8.62.134', + depName: 'Fake', + depType: 'requires', + packageName: 'Fake/8.62.134@_/_', + replaceString: 'Fake/8.62.134', + }, { currentValue: '[>1.1 <2.1, include_prerelease=True]', depName: '7zip', diff --git a/lib/modules/manager/conan/extract.ts b/lib/modules/manager/conan/extract.ts index e4fab9f50233b7f7d9b9c94dcddbf4d9904b3db9..fb869dad2fd98a6c674e9b764a65b8558877038e 100644 --- a/lib/modules/manager/conan/extract.ts +++ b/lib/modules/manager/conan/extract.ts @@ -4,7 +4,7 @@ import type { PackageDependency, PackageFileContent } from '../types'; import { isComment } from './common'; const regex = regEx( - `(?<name>[-_a-z0-9]+)/(?<version>[^@#\n{*"']+)(?<userChannel>@[-_a-zA-Z0-9]+(?:/[^#\n.{*"' ]+|))?#?(?<revision>[-_a-f0-9]+[^\n{*"'])?`, + `(?<name>[-_a-zA-Z0-9]+)/(?<version>[^@#\n{*"']+)(?<userChannel>@[-_a-zA-Z0-9]+(?:/[^#\n.{*"' ]+|))?#?(?<revision>[-_a-f0-9]+[^\n{*"'])?`, ); function setDepType(content: string, originalType: string): string {