robojerk/codeql-action

Remove redundant checks

Browse source
This commit is contained in:
Henry Mercer 2023-07-07 15:32:20 +01:00
parent a41df3ae10
commit dc0234b48c
3 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/setup-codeql.ts
View file

@ -422,24 +422,17 @@ export async function getCodeQLSource(
// Fall back to matching `0.0.0-<bundleVersion>`.
if (!codeqlFolder && tagName) {
if (tagName) {
const fallbackVersion = await tryGetFallbackToolcacheVersion(
cliVersion,
tagName,
logger
);
if (fallbackVersion) {
codeqlFolder = toolcache.find("CodeQL", fallbackVersion);
} else {
logger.debug(
"Could not determine a fallback toolcache version number for CodeQL tools version " +
`${humanReadableVersion}.`
);
}
const fallbackVersion = await tryGetFallbackToolcacheVersion(
cliVersion,
tagName,
logger
);
if (fallbackVersion) {
codeqlFolder = toolcache.find("CodeQL", fallbackVersion);
} else {
logger.debug(
"Could not determine a fallback toolcache version number for CodeQL tools version " +
`${humanReadableVersion} since the tag name is unknown.`
`${humanReadableVersion}.`
);
}
}
@ -506,9 +499,6 @@ export async function tryGetFallbackToolcacheVersion(
tagName: string,
logger: Logger
): Promise<string | undefined> {
if (!tagName) {
return undefined;
}
const bundleVersion = tryGetBundleVersionFromTagName(tagName, logger);
if (!bundleVersion) {
return undefined;