github/codeql-action
1
0
Fork 0
mirror of https://github.com/github/codeql-action.git synced 2026-11-06 13:09:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass env to all ToolRunners in codeql.ts

Browse Source
This commit is contained in:
Michael B. Gale
2026-10-26 10:50:07 +00:00
parent 49de08391c
commit 516bd7cc48
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/entry-points.js generated
View File

@@ -177331,7 +177331,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
])
);
}
await new toolrunner3.ToolRunner(cmd, args).exec();
await new toolrunner3.ToolRunner(cmd, args, {
env: env.getDefined()
}).exec();
},
async databaseExportDiagnostics(databasePath, sarifFile, automationDetailsId) {
const args = [
@@ -177350,7 +177352,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
if (automationDetailsId !== void 0) {
args.push("--sarif-category", automationDetailsId);
}
await new toolrunner3.ToolRunner(cmd, args).exec();
await new toolrunner3.ToolRunner(cmd, args, {
env: env.getDefined()
}).exec();
},
async diagnosticsExport(sarifFile, automationDetailsId, config, diagnosticDir) {
let configPath = getGeneratedCodeScanningConfigPath(config);
@@ -177377,7 +177381,9 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
if (automationDetailsId !== void 0) {
args.push("--sarif-category", automationDetailsId);
}
await new toolrunner3.ToolRunner(cmd, args).exec();
await new toolrunner3.ToolRunner(cmd, args, {
env: env.getDefined()
}).exec();
},
async resolveExtractor(language) {
let extractorPath = "";
@@ -177393,6 +177399,7 @@ async function getCodeQLForCmd(logger2, cmd, checkVersion, env = getEnv()) {
...getExtraOptionsFromEnv(["resolve", "extractor"])
],
{
env: env.getDefined(),
silent: true,
listeners: {
stdout: (data) => {

13
src/codeql.ts
View File

@@ -887,7 +887,9 @@ export async function getCodeQLForCmd(
]),
);
}
await new toolrunner.ToolRunner(cmd, args).exec();
await new toolrunner.ToolRunner(cmd, args, {
env: env.getDefined(),
}).exec();
},
async databaseExportDiagnostics(
databasePath: string,
@@ -908,7 +910,9 @@ export async function getCodeQLForCmd(
if (automationDetailsId !== undefined) {
args.push("--sarif-category", automationDetailsId);
}
await new toolrunner.ToolRunner(cmd, args).exec();
await new toolrunner.ToolRunner(cmd, args, {
env: env.getDefined(),
}).exec();
},
async diagnosticsExport(
sarifFile: string,
@@ -956,7 +960,9 @@ export async function getCodeQLForCmd(
if (automationDetailsId !== undefined) {
args.push("--sarif-category", automationDetailsId);
}
await new toolrunner.ToolRunner(cmd, args).exec();
await new toolrunner.ToolRunner(cmd, args, {
env: env.getDefined(),
}).exec();
},
async resolveExtractor(language: Language): Promise<string> {
// Request it using `format=json` so we don't need to strip the trailing new line generated by
@@ -974,6 +980,7 @@ export async function getCodeQLForCmd(
...getExtraOptionsFromEnv(["resolve", "extractor"]),
],
{
env: env.getDefined(),
silent: true,
listeners: {
stdout: (data) => {