Handle case where workingDir is undefined

This commit is contained in:
Michael B. Gale 2023-06-13 20:41:00 +01:00
parent 16f3f1a951
commit 6419f994ff
No known key found for this signature in database
GPG key ID: FF5E2765BD00628F
3 changed files with 11 additions and 5 deletions

View file

@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
exports.runResolveBuildEnvironment = void 0;
const codeql_1 = require("./codeql");
async function runResolveBuildEnvironment(cmd, logger, workingDir, language) {
logger.startGroup(`Attempting to resolve build environment for ${language} in ${workingDir}`);
logger.startGroup(`Attempting to resolve build environment for ${language}`);
if (workingDir !== undefined) {
logger.info(`Using ${workingDir} as the working directory.`);
}
const codeql = await (0, codeql_1.getCodeQL)(cmd);
const result = await codeql.resolveBuildEnvironment(workingDir, language);
logger.endGroup();

View file

@ -1 +1 @@
{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAI9B,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,QAAkB;IAElB,MAAM,CAAC,UAAU,CACf,+CAA+C,QAAQ,OAAO,UAAU,EAAE,CAC3E,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAbD,gEAaC"}
{"version":3,"file":"resolve-environment.js","sourceRoot":"","sources":["../src/resolve-environment.ts"],"names":[],"mappings":";;;AAAA,qCAAqC;AAI9B,KAAK,UAAU,0BAA0B,CAC9C,GAAW,EACX,MAAc,EACd,UAA8B,EAC9B,QAAkB;IAElB,MAAM,CAAC,UAAU,CAAC,+CAA+C,QAAQ,EAAE,CAAC,CAAC;IAE7E,IAAI,UAAU,KAAK,SAAS,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,SAAS,UAAU,4BAA4B,CAAC,CAAC;KAC9D;IAED,MAAM,MAAM,GAAG,MAAM,IAAA,kBAAS,EAAC,GAAG,CAAC,CAAC;IACpC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC1E,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClB,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,gEAgBC"}

View file

@ -8,9 +8,12 @@ export async function runResolveBuildEnvironment(
workingDir: string | undefined,
language: Language
) {
logger.startGroup(
`Attempting to resolve build environment for ${language} in ${workingDir}`
);
logger.startGroup(`Attempting to resolve build environment for ${language}`);
if (workingDir !== undefined) {
logger.info(`Using ${workingDir} as the working directory.`);
}
const codeql = await getCodeQL(cmd);
const result = await codeql.resolveBuildEnvironment(workingDir, language);
logger.endGroup();