feat(manager/conan): Conan 1 package name compatibility (#32425)

Co-authored-by: Rhys Arkins <[email protected]>
renovatebot · Nov 16, 2024 · dbfa6b2 · dbfa6b2
1 parent a413b75
commit dbfa6b2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 {