Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions lib/workers/repository/update/branch/get-updated.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1667,8 +1667,7 @@ describe('workers/repository/update/branch/get-updated', () => {
});
});

// should never happen, but our types allow this
it('rejects when an updated dependency has no new version', async () => {
it('skips the pending-version check when re-extracted dep has no resolvable version', async () => {
config.upgrades.push({
packageFile: 'composer.json',
manager: 'composer',
Expand Down Expand Up @@ -1699,19 +1698,16 @@ describe('workers/repository/update/branch/get-updated', () => {
],
});

await expect(getUpdatedPackageFiles(config)).rejects.toThrowError(
'update-failure',
);

expect(logger.logger.error).toHaveBeenCalledWith(
const res = await getUpdatedPackageFiles(config);
expect(res.artifactErrors).toHaveLength(0);
expect(logger.logger.warn).toHaveBeenCalledWith(
{
packageFile: 'composer.json',
manager: 'composer',
branchName: 'renovate/pin',
depName: 'some-dep',
newVersion: undefined,
},
"No new version found for 'some-dep' after updating 'composer.json'",
"Could not determine resolved version for 'some-dep' after updating 'composer.json'; skipping pending-version check",
);
});

Expand Down
7 changes: 3 additions & 4 deletions lib/workers/repository/update/branch/get-updated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -602,17 +602,16 @@ async function checkForPendingVersions(
dep.currentVersion ??
dep.currentValue;
if (!resolvedVersion) {
logger.error(
logger.warn(
Comment thread
viceice marked this conversation as resolved.
{
packageFile: packageFileName,
manager,
branchName: config.branchName,
depName,
newVersion: resolvedVersion,
},
`No new version found for '${depName}' after updating '${packageFileName}'`,
`Could not determine resolved version for '${depName}' after updating '${packageFileName}'; skipping pending-version check`,
);
throw new Error(WORKER_FILE_UPDATE_FAILED);
continue;
}

if (resolvedVersion && upgradeInfo.pendingVersions.has(resolvedVersion)) {
Expand Down
Loading