github/codeql-action
0
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-05-04 12:50:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix early termination

Browse Source
This commit is contained in:
Marco Gario
2020-09-15 20:58:13 +02:00
parent 4d836f4b5a
commit b9f08d924a
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/codeql.js
Generated
+8 -6
View File
@@ -68,7 +68,8 @@ async function getCodeQLBundleDownloadURL(bundleNames, githubAuth, githubUrl, mo
const [apiURL, repository] = downloadSource;
// If we've reached the final case, short-circuit the API check since we know the bundle exists and is public.
if (apiURL === util.GITHUB_DOTCOM_URL &&
repository === CODEQL_DEFAULT_ACTION_REPOSITORY) {
repository === CODEQL_DEFAULT_ACTION_REPOSITORY &&
bundleNames[0] === CODEQL_BUNDLE_NAME) {
break;
}
const [repositoryOwner, repositoryName] = repository.split("/");
@@ -81,12 +82,13 @@ async function getCodeQLBundleDownloadURL(bundleNames, githubAuth, githubUrl, mo
tag: CODEQL_BUNDLE_VERSION,
});
// See if any of the bundles appears in the assets list
const assetMap = new Map(release.data.assets.map((x) => [x.name, x]));
for (const bundleName of bundleNames) {
for (const asset of release.data.assets) {
if (asset.name === bundleName) {
logger.info(`Found CodeQL bundle in ${downloadSource[1]} on ${downloadSource[0]} with URL ${asset.url}.`);
return asset.url;
}
logger.debug(`Looking for ${bundleName}`);
const asset = assetMap.get(bundleName);
if (asset) {
logger.info(`Found CodeQL bundle in ${downloadSource[1]} on ${downloadSource[0]} with URL ${asset.url}.`);
return asset.url;
}
}
}
lib/codeql.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
src/codeql.ts
+11 -8
View File
@@ -166,7 +166,8 @@ export async function getCodeQLBundleDownloadURL(
// If we've reached the final case, short-circuit the API check since we know the bundle exists and is public.
if (
apiURL === util.GITHUB_DOTCOM_URL &&
repository === CODEQL_DEFAULT_ACTION_REPOSITORY
repository === CODEQL_DEFAULT_ACTION_REPOSITORY &&
bundleNames[0] === CODEQL_BUNDLE_NAME
) {
break;
}
@@ -179,15 +180,17 @@ export async function getCodeQLBundleDownloadURL(
repo: repositoryName,
tag: CODEQL_BUNDLE_VERSION,
});
// See if any of the bundles appears in the assets list
const assetMap = new Map(release.data.assets.map((x) => [x.name, x]));
for (const bundleName of bundleNames) {
for (const asset of release.data.assets) {
if (asset.name === bundleName) {
logger.info(
`Found CodeQL bundle in ${downloadSource[1]} on ${downloadSource[0]} with URL ${asset.url}.`
);
return asset.url;
}
logger.debug(`Looking for ${bundleName}`);
const asset = assetMap.get(bundleName);
if (asset) {
logger.info(
`Found CodeQL bundle in ${downloadSource[1]} on ${downloadSource[0]} with URL ${asset.url}.`
);
return asset.url;
}
}
} catch (e) {