renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-12 15:06:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(git-submodules): sequential submodules processing (#11659) (#11661)

Browse source
This commit is contained in:
Eric Citaire 2021-09-09 17:34:09 +02:00 committed by GitHub
parent 955942b563
commit f4ebbb78a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
lib/manager/git-submodules/extract.ts
View file

@ -98,40 +98,33 @@ export default async function extractPackageFile(
return null;
}
const deps = (
await Promise.all(
depNames.map(async ({ name, path }) => {
try {
const [currentDigest] = (await git.subModule(['status', path]))
.trim()
.replace(/^[-+]/, '')
.split(/\s/);
const subModuleUrl = await getUrl(git, gitModulesPath, name);
// hostRules only understands HTTP URLs
// Find HTTP URL, then apply token
let httpSubModuleUrl = getHttpUrl(subModuleUrl);
httpSubModuleUrl = getRemoteUrlWithToken(httpSubModuleUrl);
const currentValue = await getBranch(
gitModulesPath,
name,
httpSubModuleUrl
);
return {
depName: path,
lookupName: getHttpUrl(subModuleUrl),
currentValue,
currentDigest,
};
} catch (err) /* istanbul ignore next */ {
logger.warn(
{ err },
'Error mapping git submodules during extraction'
);
return null;
}
})
)
).filter(Boolean);
const deps = [];
for (const { name, path } of depNames) {
try {
const [currentDigest] = (await git.subModule(['status', path]))
.trim()
.replace(/^[-+]/, '')
.split(/\s/);
const subModuleUrl = await getUrl(git, gitModulesPath, name);
// hostRules only understands HTTP URLs
// Find HTTP URL, then apply token
let httpSubModuleUrl = getHttpUrl(subModuleUrl);
httpSubModuleUrl = getRemoteUrlWithToken(httpSubModuleUrl);
const currentValue = await getBranch(
gitModulesPath,
name,
httpSubModuleUrl
);
deps.push({
depName: path,
lookupName: getHttpUrl(subModuleUrl),
currentValue,
currentDigest,
});
} catch (err) /* istanbul ignore next */ {
logger.warn({ err }, 'Error mapping git submodules during extraction');
}
}
return { deps, datasource: datasourceGitRefs.id };
}