Merge branch 'fix/build-output-retrieval' into fix/linux-act-setup

src/act.ts

@@ -2,9 +2,9 @@ import * as childProcess from "child_process";
 import * as fs from "fs/promises";
 import * as path from "path";
 import sanitize from "sanitize-filename";
-import { CustomExecution, EventEmitter, ExtensionContext, Pseudoterminal, ShellExecution, TaskDefinition, TaskGroup, TaskPanelKind, TaskRevealKind, tasks, TaskScope, TerminalDimensions, Uri, window, workspace, WorkspaceFolder } from "vscode";
+import { CustomExecution, env, EventEmitter, ExtensionContext, Pseudoterminal, ShellExecution, TaskDefinition, TaskGroup, TaskPanelKind, TaskRevealKind, tasks, TaskScope, TerminalDimensions, Uri, window, workspace, WorkspaceFolder } from "vscode";
 import { ComponentsManager } from "./componentsManager";
-import { ConfigurationManager, Section } from "./configurationManager";
+import { ConfigurationManager, Platform, Section } from "./configurationManager";
 import { componentsTreeDataProvider, historyTreeDataProvider } from './extension';
 import { HistoryManager, HistoryStatus } from './historyManager';
 import { SecretManager } from "./secretManager";
@@ -172,9 +172,9 @@ export class Act {
         });
 
         // Refresh components view after installation
-        tasks.onDidEndTask(async e => {
+        tasks.onDidEndTaskProcess(async e => {
             const taskDefinition = e.execution.task.definition;
-            if (taskDefinition.type === 'nektos/act installation') {
+            if (taskDefinition.type === 'nektos/act installation' && e.exitCode === 0) {
                 // Update base act command based on installation method
                 if (taskDefinition.ghCliInstall) {
                     await ConfigurationManager.set(Section.actCommand, Act.githubCliCommand);
@@ -191,6 +191,19 @@ export class Act {
         return ConfigurationManager.get<string>(Section.actCommand) || Act.command;
     }
 
+    private getShell() {
+        switch (process.platform) {
+            case Platform.windows:
+                return 'cmd';
+            case Platform.mac:
+                return 'zsh';
+            case Platform.linux:
+                return 'bash';
+            default:
+                return env.shell;
+        }
+    }
+
     async runAllWorkflows(workspaceFolder: WorkspaceFolder) {
         return await this.runCommand({
             path: workspaceFolder.uri.fsPath,
@@ -367,14 +380,17 @@ export class Act {
                     command,
                     {
                         cwd: commandArgs.path,
-                        shell: true,
-                        env: settings.secrets
+                        shell: this.getShell(),
+                        env: {
+                            ...process.env,
+                            ...settings.secrets
                                 .filter(secret => secret.value)
                                 .reduce((previousValue, currentValue) => {
                                     previousValue[currentValue.key] = currentValue.value;
                                     return previousValue;
                                 }, {} as Record<string, string>)
                         }
+                    }
                 );
                 exec.stdout.on('data', handleIO);
                 exec.stderr.on('data', handleIO);
@@ -458,7 +474,7 @@ export class Act {
                 problemMatchers: [],
                 runOptions: {},
                 group: TaskGroup.Build,
-                execution: new ShellExecution(command)
+                execution: new ShellExecution(command, { executable: this.getShell() })
             });
         }
     }

src/componentsManager.ts

@@ -109,7 +109,7 @@ export class ComponentsManager {
 
                         if (selectedPrebuiltExecutable) {
                             await env.openExternal(Uri.parse(selectedPrebuiltExecutable.link));
-                            window.showInformationMessage('Unpack and run the executable in the terminal specifying the full path or add it to one of the paths in your PATH environment variable. Once nektos/act is successfully installed, refresh the components view.', 'Refresh').then(async value => {
+                            window.showInformationMessage('Unpack the executable and move it to your desired location. Once nektos/act is successfully installed, add it to your shell\'s PATH and then refresh the components view.', 'Refresh').then(async value => {
                                 if (value === 'Refresh') {
                                     componentsTreeDataProvider.refresh();
                                 }
@@ -117,7 +117,7 @@ export class ComponentsManager {
                         }
                     } else if (selectedInstallationMethod.link) {
                         await env.openExternal(Uri.parse(selectedInstallationMethod.link));
-                        window.showInformationMessage('Once nektos/act is successfully installed, refresh the components view.', 'Refresh').then(async value => {
+                        window.showInformationMessage('Once nektos/act is successfully installed, add it to your shell\'s PATH and then refresh the components view.', 'Refresh').then(async value => {
                             if (value === 'Refresh') {
                                 componentsTreeDataProvider.refresh();
                             }
@@ -169,7 +169,7 @@ export class ComponentsManager {
                             problemMatchers: [],
                             runOptions: {},
                             group: TaskGroup.Build,
-                            execution: new ShellExecution('systemctl start docker')
+                            execution: new ShellExecution('systemctl start docker', { executable: env.shell })
                         });
                     } else {
                         window.showErrorMessage(`Invalid environment: ${process.platform}`, 'Report an Issue').then(async value => {

src/settingsManager.ts

@@ -164,7 +164,7 @@ export class SettingsManager {
         return environments;
     }
 
-    async createSettingFile(workspaceFolder: WorkspaceFolder, storageKey: StorageKey, settingFileName: string) {
+    async createSettingFile(workspaceFolder: WorkspaceFolder, storageKey: StorageKey, settingFileName: string, content: string) {
         const settingFileUri = Uri.file(path.join(workspaceFolder.uri.fsPath, settingFileName));
 
         try {
@@ -172,7 +172,7 @@ export class SettingsManager {
             window.showErrorMessage(`A file or folder named ${settingFileName} already exists at ${workspaceFolder.uri.fsPath}. Please choose another name.`);
         } catch (error: any) {
             try {
-                await workspace.fs.writeFile(settingFileUri, new TextEncoder().encode(''));
+                await workspace.fs.writeFile(settingFileUri, new TextEncoder().encode(content));
                 await this.locateSettingFile(workspaceFolder, storageKey, [settingFileUri]);
                 const document = await workspace.openTextDocument(settingFileUri);
                 await window.showTextDocument(document);

src/views/settings/settingsTreeDataProvider.ts

@@ -29,7 +29,7 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                 });
 
                 if (secretFileName) {
-                    await act.settingsManager.createSettingFile(secretsTreeItem.workspaceFolder, secretsTreeItem.storageKey, secretFileName);
+                    await act.settingsManager.createSettingFile(secretsTreeItem.workspaceFolder, secretsTreeItem.storageKey, secretFileName, '');
                     this.refresh();
                 }
             }),
@@ -55,7 +55,7 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                 });
 
                 if (variableFileName) {
-                    await act.settingsManager.createSettingFile(variablesTreeItem.workspaceFolder, variablesTreeItem.storageKey, variableFileName);
+                    await act.settingsManager.createSettingFile(variablesTreeItem.workspaceFolder, variablesTreeItem.storageKey, variableFileName, '');
                     this.refresh();
                 }
             }),
@@ -81,7 +81,7 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                 });
 
                 if (inputFileName) {
-                    await act.settingsManager.createSettingFile(inputsTreeItem.workspaceFolder, inputsTreeItem.storageKey, inputFileName);
+                    await act.settingsManager.createSettingFile(inputsTreeItem.workspaceFolder, inputsTreeItem.storageKey, inputFileName, '');
                     this.refresh();
                 }
             }),
@@ -107,7 +107,7 @@ export default class SettingsTreeDataProvider implements TreeDataProvider<Github
                 });
 
                 if (payloadFileName) {
-                    await act.settingsManager.createSettingFile(payloadsTreeItem.workspaceFolder, payloadsTreeItem.storageKey, payloadFileName);
+                    await act.settingsManager.createSettingFile(payloadsTreeItem.workspaceFolder, payloadsTreeItem.storageKey, payloadFileName, '{}');
                     this.refresh();
                 }
             }),