Fixing building for ci tests

src/build/buildTask.ts

@@ -31,10 +31,6 @@ export class BuildTask {
  private currentWorkspace: vscode.Uri;
  private idfPathDir: string;
  private adapterTargetName: string;
- private processOptions: vscode.ProcessExecutionOptions;
- private modifiedEnv: { [key: string]: string };
- private pythonBinPath: string;
-
  constructor(workspaceUri: vscode.Uri) {
  this.currentWorkspace = workspaceUri;
  this.idfPathDir = idfConf.readParameter(
@@ -49,15 +45,6 @@ export class BuildTask {
  "idf.buildPath",
  workspaceUri
  ) as string;
- this.modifiedEnv = appendIdfAndToolsToPath(workspaceUri);
- this.processOptions = {
- cwd: this.buildDirPath,
- env: this.modifiedEnv,
- };
- this.pythonBinPath = idfConf.readParameter(
- "idf.pythonBinPath",
- workspaceUri
- ) as string;
  }
 
  public building(flag: boolean) {
@@ -87,16 +74,21 @@ export class BuildTask {
  throw new Error("ALREADY_BUILDING");
  }
  this.building(true);
+ const modifiedEnv = appendIdfAndToolsToPath(this.currentWorkspace);
+ const processOptions = {
+ cwd: this.buildDirPath,
+ env: modifiedEnv,
+ };
  await ensureDir(this.buildDirPath);
  const canAccessCMake = await isBinInPath(
  "cmake",
  this.currentWorkspace.fsPath,
- this.modifiedEnv
+ modifiedEnv
  );
  const canAccessNinja = await isBinInPath(
  "ninja",
  this.currentWorkspace.fsPath,
- this.modifiedEnv
+ modifiedEnv
  );
 
  const cmakeCachePath = join(this.buildDirPath, "CMakeCache.txt");
@@ -164,7 +156,7 @@ export class BuildTask {
  }
  }
  const cmakeCommand = "cmake";
- const compileExecution = new vscode.ProcessExecution(cmakeCommand, compilerArgs, this.processOptions);
+ const compileExecution = new vscode.ProcessExecution(cmakeCommand, compilerArgs, processOptions);
  const compilePresentationOptions = {
  reveal: showTaskOutput,
  showReuseMessage: false,
@@ -191,7 +183,7 @@ export class BuildTask {
  string
  >) || [];
  const ninjaCommand = "ninja";
- const buildExecution = new vscode.ProcessExecution(ninjaCommand, buildArgs, this.processOptions);
+ const buildExecution = new vscode.ProcessExecution(ninjaCommand, buildArgs, processOptions);
  const buildPresentationOptions = {
  reveal: showTaskOutput,
  showReuseMessage: false,
@@ -213,6 +205,15 @@ export class BuildTask {
  const modifiedEnv = appendIdfAndToolsToPath(this.currentWorkspace);
  await ensureDir(this.buildDirPath);
 
+ const processOptions = {
+ cwd: this.buildDirPath,
+ env: modifiedEnv,
+ };
+ const pythonBinPath = idfConf.readParameter(
+ "idf.pythonBinPath",
+ this.currentWorkspace
+ ) as string;
+
  const currentWorkspaceFolder = vscode.workspace.workspaceFolders.find(
  (w) => w.uri === this.currentWorkspace
  );
@@ -237,7 +238,7 @@ export class BuildTask {
  "--pid",
  selectedDFUAdapterId(this.adapterTargetName)
  ];
- const writeExecution = new vscode.ProcessExecution(this.pythonBinPath, args, this.processOptions);
+ const writeExecution = new vscode.ProcessExecution(pythonBinPath, args, processOptions);
  const buildPresentationOptions = {
  reveal: showTaskOutput,
  showReuseMessage: false,