fix(circleci): correctly get a Orb name when a line has an inline com…

…ment (#27736)
renovatebot · Mar 6, 2024 · 66db519 · 66db519
1 parent 6b06555
commit 66db519
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/modules/manager/circleci/__fixtures__/config2.yml b/lib/modules/manager/circleci/__fixtures__/config2.yml
@@ -5,11 +5,11 @@ orbs:
   release-workflows: hutson/library-release-workflows@4.1.0
   # Comments help me understand my work.
   # The next line is intentionally just whitespace!
-  
+
   no-version: abc/def
 
   # Comments help me understand my work.
-  volatile: zzz/zzz@volatile
+  volatile: zzz/zzz@volatile # Comments help me understand my work.
 
 test_plan: &test_plan
   steps:

diff --git a/lib/modules/manager/circleci/extract.ts b/lib/modules/manager/circleci/extract.ts
@@ -29,7 +29,9 @@ export function extractPackageFile(
             lineNumber += 1;
             continue;
           }
-          const orbMatch = regEx(/^\s+([^:]+):\s(.+)$/).exec(orbLine);
+          const orbMatch = regEx(/^\s+([^:]+):\s(.+?)(?:\s*#.*)?$/).exec(
+            orbLine,
+          );
           if (orbMatch) {
             logger.trace('orbMatch');
             foundOrbOrNoop = true;