Remove unneeded version guards
This commit is contained in:
parent
d77a73b68c
commit
fc983c82c2
12 changed files with 25 additions and 186 deletions
14
lib/config-utils.js
generated
14
lib/config-utils.js
generated
|
|
@ -34,7 +34,6 @@ exports.getNoLanguagesError = getNoLanguagesError;
|
|||
exports.getUnknownLanguagesError = getUnknownLanguagesError;
|
||||
exports.getLanguagesInRepo = getLanguagesInRepo;
|
||||
exports.getLanguages = getLanguages;
|
||||
exports.getLanguageAliases = getLanguageAliases;
|
||||
exports.getRawLanguages = getRawLanguages;
|
||||
exports.getDefaultConfig = getDefaultConfig;
|
||||
exports.calculateAugmentation = calculateAugmentation;
|
||||
|
|
@ -54,7 +53,6 @@ const perf_hooks_1 = require("perf_hooks");
|
|||
const yaml = __importStar(require("js-yaml"));
|
||||
const semver = __importStar(require("semver"));
|
||||
const api = __importStar(require("./api-client"));
|
||||
const codeql_1 = require("./codeql");
|
||||
const feature_flags_1 = require("./feature-flags");
|
||||
const languages_1 = require("./languages");
|
||||
const trap_caching_1 = require("./trap-caching");
|
||||
|
|
@ -155,7 +153,7 @@ async function getLanguages(codeQL, languagesInput, repository, logger) {
|
|||
logger.info(`Automatically detected languages: ${languages.join(", ")}`);
|
||||
}
|
||||
else {
|
||||
const aliases = await getLanguageAliases(codeQL);
|
||||
const aliases = (await codeQL.betterResolveLanguages()).aliases;
|
||||
if (aliases) {
|
||||
languages = languages.map((lang) => aliases[lang] || lang);
|
||||
}
|
||||
|
|
@ -185,16 +183,6 @@ async function getLanguages(codeQL, languagesInput, repository, logger) {
|
|||
}
|
||||
return parsedLanguages;
|
||||
}
|
||||
/**
|
||||
* Gets the set of languages supported by CodeQL, along with their aliases if supported by the
|
||||
* version of the CLI.
|
||||
*/
|
||||
async function getLanguageAliases(codeql) {
|
||||
if (await (0, util_1.codeQlVersionAtLeast)(codeql, codeql_1.CODEQL_VERSION_LANGUAGE_ALIASING)) {
|
||||
return (await codeql.betterResolveLanguages()).aliases;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
/**
|
||||
* Gets the set of languages in the current repository without checking to
|
||||
* see if these languages are actually supported by CodeQL.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue