fix(conan): allow include_prerelease without argument

dkoerner-festo · Jan 10, 2024 · 1b281f1 · 1b281f1
1 parent c700630
commit 1b281f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/lib/modules/manager/conan/__fixtures__/conanfile.py b/lib/modules/manager/conan/__fixtures__/conanfile.py
@@ -12,6 +12,7 @@ class Pkg(ConanFile):
    requires = (("req_c/1.0@user/stable", "private"), )
    requires = ("req_f/1.0@user/stable", ("req_h/3.0@other/beta", "override"))
    requires = "req_g/[>1.0 <1.8]@user/stable"
+   requires = "req_z/[>1.0 <1.8, include_prerelease]@user/stable"
 #  requires = "commentedout/[>1.0 <1.8]@user/stable"
    #  requires = "commentedout2/[>1.0 <1.8]@user/stable"
    requires = (("req_l/1.0@user/stable#bc592346b33fd19c1fbffce25d1e4236", "private"), )

diff --git a/lib/modules/manager/conan/extract.spec.ts b/lib/modules/manager/conan/extract.spec.ts
@@ -208,6 +208,13 @@ describe('modules/manager/conan/extract', () => {
           packageName: 'req_g/[>1.0 <1.8]@user/stable',
           replaceString: 'req_g/[>1.0 <1.8]@user/stable',
         },
+        {
+          currentValue: '[>1.0 <1.8, include_prerelease]',
+          depName: 'req_z',
+          depType: 'requires',
+          packageName: 'req_z/[>1.0 <1.8, include_prerelease]@user/stable',
+          replaceString: 'req_z/[>1.0 <1.8, include_prerelease]@user/stable',
+        },
         {
           autoReplaceStringTemplate:
             '{{depName}}/{{newValue}}@user/stable{{#if newDigest}}#{{newDigest}}{{/if}}',