Propagate --working-dir argument

github · Jun 13, 2023 · 6f07b50 · 6f07b50
1 parent fce65da
commit 6f07b50
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 22 deletions.
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/resolve-environment-action.js b/lib/resolve-environment-action.js
diff --git a/lib/resolve-environment-action.js.map b/lib/resolve-environment-action.js.map
diff --git a/lib/resolve-environment.js b/lib/resolve-environment.js
diff --git a/lib/resolve-environment.js.map b/lib/resolve-environment.js.map
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -122,6 +122,7 @@ export interface CodeQL {
    * Run 'codeql resolve build-environment'
    */
   resolveBuildEnvironment(
+    workingDir: string | undefined,
     language: Language
   ): Promise<ResolveBuildEnvironmentOutput>;
 
@@ -700,13 +701,19 @@ export async function getCodeQLForCmd(
         throw new Error(`Unexpected output from codeql resolve queries: ${e}`);
       }
     },
-    async resolveBuildEnvironment(language: Language) {
+    async resolveBuildEnvironment(
+      workingDir: string | undefined,
+      language: Language
+    ) {
       const codeqlArgs = [
         "resolve",
         "build-environment",
         `--language=${language}`,
         ...getExtraOptionsFromEnv(["resolve", "build-environment"]),
       ];
+      if (workingDir !== undefined) {
+        codeqlArgs.push("--working-dir", workingDir);
+      }
       const output = await runTool(cmd, codeqlArgs);
 
       try {

diff --git a/src/resolve-environment-action.ts b/src/resolve-environment-action.ts
@@ -80,16 +80,10 @@ async function run() {
     );
 
     const workingDirectory = getOptionalInput("working-directory");
-    if (workingDirectory) {
-      logger.info(
-        `Changing autobuilder working directory to ${workingDirectory}`
-      );
-      process.chdir(workingDirectory);
-    }
-
     const result = await runResolveBuildEnvironment(
       initCodeQLResult.codeql.getPath(),
       logger,
+      workingDirectory,
       language
     );
     core.setOutput("environment", result);

diff --git a/src/resolve-environment.ts b/src/resolve-environment.ts
@@ -5,11 +5,14 @@ import { Logger } from "./logging";
 export async function runResolveBuildEnvironment(
   cmd: string,
   logger: Logger,
+  workingDir: string | undefined,
   language: Language
 ) {
-  logger.startGroup(`Attempting to resolve build environment for ${language}`);
+  logger.startGroup(
+    `Attempting to resolve build environment for ${language} in ${workingDir}`
+  );
   const codeQL = await getCodeQL(cmd);
-  const result = await codeQL.resolveBuildEnvironment(language);
+  const result = await codeQL.resolveBuildEnvironment(workingDir, language);
   logger.endGroup();
   return result;
 }