From 5665bee5728e73c0d36abdb3c72ec47a96d03152 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Thu, 19 Nov 2026 23:57:43 -0500 Subject: [PATCH] feat(renovate): track commit-pinned CPM packages --- renovate/cmake.json5 | 2 ++ tests/renovate-config.test.mjs | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/renovate/cmake.json5 b/renovate/cmake.json5 index 4248cc8e..f3396130 100644 --- a/renovate/cmake.json5 +++ b/renovate/cmake.json5 @@ -7,6 +7,8 @@ "customType": "regex", "managerFilePatterns": ["/(^|\/)package-lock.cmake$/"], "matchStrings": [ + // Track the branch's commit while CMake keeps using the pinned SHA. + "# renovate: datasource=(?git-refs) depName=(?\\S+) packageName=(?\\S+)\\s+# ref=(?\\S+)\\s+set\\([A-Za-z0-9_]+_COMMIT\\s+\"?(?[a-fA-F0-9]{40})\"?\\s*\\)", "# renovate: datasource=(?[a-zA-Z0-9-._]+?) depName=(?[^\\s]+?)(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)packageName=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)versioning=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)extractVersion=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)registryUrl=(?[^\\s]+?))?\\s+set\\([A-Za-z0-9_]+?_(?:VERSION|TAG)\\s+\\\"?(?[^\\\"\\s\\)]+)\\\"?\\s*\\)", "# renovate: datasource=(?[a-zA-Z0-9-._]+?) depName=(?[^\\s]+?)(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)packageName=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)versioning=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)extractVersion=(?[^\\s]+?))?(?:(?:[ \\t]+|\\s*\\r?\\n#\\s*)registryUrl=(?[^\\s]+?))?\\s+set\\([A-Za-z0-9_]+?_(?:VERSION|TAG)\\s+\\\"?(?[^\\\"\\s\\)]+)\\\"?\\s*\\)\\s+set\\([A-Za-z0-9_]+?_SHA256\\s+(?[a-fA-F0-9]{64})\\s*\\)", ], diff --git a/tests/renovate-config.test.mjs b/tests/renovate-config.test.mjs index 45c0ff9a..588744d6 100644 --- a/tests/renovate-config.test.mjs +++ b/tests/renovate-config.test.mjs @@ -230,6 +230,37 @@ test('extracts a GitHub branch and jsDelivr commit from a composite action', () ); }); +test('extracts an annotated branch and commit from a CPM package lock', () => { + const fileName = 'cmake/package-lock.cmake'; + const manager = renovateConfig.customManagers.find( + item => item.managerFilePatterns.some(pattern => pattern.includes('package-lock.cmake')), + ); + assert.ok(manager, 'Expected to find the CPM package lock custom manager'); + assert.ok(matchesManagerFilePattern(fileName, manager.managerFilePatterns)); + + const commit = '63a9e6a216796aeba2535a3bac8e79ba5d95166d'; + const content = [ + '# renovate: datasource=git-refs depName=example/port packageName=https://github.com/example/port.git', + '# ref=main', + `set(EXAMPLE_PORT_COMMIT "${commit}")`, + '', + '# renovate: datasource=github-tags depName=example/library versioning=semver', + 'set(EXAMPLE_LIBRARY_VERSION 1.2.3)', + ].join('\r\n'); + const dependencies = extractRegexPackageFile(content, fileName, manager)?.deps ?? []; + assert.equal(dependencies.length, 2); + + const port = dependencies.find(dependency => dependency.depName === 'example/port'); + assert.ok(port); + assert.equal(port.datasource, 'git-refs'); + assert.equal(port.packageName, 'https://github.com/example/port.git'); + assert.equal(port.currentValue, 'main'); + assert.equal(port.currentDigest, commit); + const library = dependencies.find(dependency => dependency.depName === 'example/library'); + assert.ok(library); + assert.equal(library.currentValue, '1.2.3'); +}); + test('extracts and updates pinned conda-forge dependencies from environment files', () => { const fileName = 'environment.yml'; const content = `