Merge remote-tracking branch 'origin/main' into henrymercer/run-unit-tests-on-windows

This commit is contained in:
Henry Mercer 2022-07-11 17:57:19 +01:00
commit fc926423a5
7 changed files with 17 additions and 7 deletions

View file

@ -249,11 +249,14 @@ export async function installPythonDeps(codeql: CodeQL, logger: Logger) {
if (process.platform === "win32") {
await new toolrunner.ToolRunner(await safeWhich.safeWhich("py"), [
"-3",
"-B",
path.join(scriptsFolder, script),
path.dirname(codeql.getPath()),
]).exec();
} else {
await new toolrunner.ToolRunner(path.join(scriptsFolder, script), [
await new toolrunner.ToolRunner(await safeWhich.safeWhich("python3"), [
"-B",
path.join(scriptsFolder, script),
path.dirname(codeql.getPath()),
]).exec();
}