robojerk/codeql-action

Merge branch 'main' into henrymercer/deprecation-warning-for-codeql-2.10.x

Browse source
This commit is contained in:
Henry Mercer 2023-09-15 12:01:50 +01:00
commit a087b01cdd
23 changed files with 223 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/codeql.ts
View file

@ -216,6 +216,9 @@ export interface ResolveLanguagesOutput {
}
export interface BetterResolveLanguagesOutput {
aliases?: {
[alias: string]: string;
};
extractors: {
[language: string]: [
{
@ -344,6 +347,11 @@ export const CODEQL_VERSION_RESOLVE_ENVIRONMENT = "2.13.4";
*/
export const CODEQL_VERSION_LANGUAGE_BASELINE_CONFIG = "2.14.2";
/**
* Versions 2.14.4+ of the CodeQL CLI support language aliasing.
*/
export const CODEQL_VERSION_LANGUAGE_ALIASING = "2.14.4";
/**
* Set up CodeQL CLI access.
*
@ -724,11 +732,20 @@ export async function getCodeQLForCmd(
}
},
async betterResolveLanguages() {
const extraArgs: string[] = [];
if (
await util.codeQlVersionAbove(this, CODEQL_VERSION_LANGUAGE_ALIASING)
) {
extraArgs.push("--extractor-include-aliases");
}
const codeqlArgs = [
"resolve",
"languages",
"--format=betterjson",
"--extractor-options-verbosity=4",
...extraArgs,
...getExtraOptionsFromEnv(["resolve", "languages"]),
];
const output = await runTool(cmd, codeqlArgs);