DevInfra/github-local-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make run event trigger individual tasks and add fix for when user uses json flag

Browse Source 
Signed-off-by: Sanjula Ganepola <sanjulagane@gmail.com>
This commit is contained in:
Sanjula Ganepola
2024-11-30 17:15:52 -05:00
parent c8ee9c2cd9
commit c0ebf56ada
3 changed files with 72 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/act.ts
View File

@@ -114,7 +114,7 @@ export enum Option {
export interface CommandArgs { export interface CommandArgs {
path: string, path: string,
options: string, options: string[],
name: string, name: string,
extraHeader: { key: string, value: string }[] extraHeader: { key: string, value: string }[]
} }
@@ -253,7 +253,7 @@ export class Act {
async runAllWorkflows(workspaceFolder: WorkspaceFolder) { async runAllWorkflows(workspaceFolder: WorkspaceFolder) {
return await this.runCommand({ return await this.runCommand({
path: workspaceFolder.uri.fsPath, path: workspaceFolder.uri.fsPath,
options: ``, options: [],
name: workspaceFolder.name, name: workspaceFolder.name,
extraHeader: [] extraHeader: []
}); });
@@ -262,7 +262,9 @@ export class Act {
async runWorkflow(workspaceFolder: WorkspaceFolder, workflow: Workflow) { async runWorkflow(workspaceFolder: WorkspaceFolder, workflow: Workflow) {
return await this.runCommand({ return await this.runCommand({
path: workspaceFolder.uri.fsPath, path: workspaceFolder.uri.fsPath,
options: `${Option.Workflows} ".github/workflows/${path.parse(workflow.uri.fsPath).base}"`, options: [
`${Option.Workflows} ".github/workflows/${path.parse(workflow.uri.fsPath).base}"`
],
name: workflow.name, name: workflow.name,
extraHeader: [ extraHeader: [
{ key: 'Workflow', value: workflow.name } { key: 'Workflow', value: workflow.name }
@@ -273,7 +275,10 @@ export class Act {
async runJob(workspaceFolder: WorkspaceFolder, workflow: Workflow, job: Job) { async runJob(workspaceFolder: WorkspaceFolder, workflow: Workflow, job: Job) {
return await this.runCommand({ return await this.runCommand({
path: workspaceFolder.uri.fsPath, path: workspaceFolder.uri.fsPath,
options: `${Option.Workflows} ".github/workflows/${path.parse(workflow.uri.fsPath).base}" ${Option.Job} "${job.id}"`, options: [
`${Option.Workflows} ".github/workflows/${path.parse(workflow.uri.fsPath).base}"`,
`${Option.Job} "${job.id}"`
],
name: `${workflow.name}/${job.name}`, name: `${workflow.name}/${job.name}`,
extraHeader: [ extraHeader: [
{ key: 'Workflow', value: workflow.name }, { key: 'Workflow', value: workflow.name },
@@ -283,14 +288,19 @@ export class Act {
} }
async runEvent(workspaceFolder: WorkspaceFolder, event: Event) { async runEvent(workspaceFolder: WorkspaceFolder, event: Event) {
return await this.runCommand({ let eventExists: boolean = false;
path: workspaceFolder.uri.fsPath,
options: event, const workflows = await this.workflowsManager.getWorkflows(workspaceFolder);
name: event, for (const workflow of workflows) {
extraHeader: [ if (event in workflow.yaml.on) {
{ key: 'Event', value: event } eventExists = true;
] await this.runWorkflow(workspaceFolder, workflow);
}); }
}
if (!eventExists) {
window.showErrorMessage(`No workflows triggered by the ${event} event.`)
}
} }
async runCommand(commandArgs: CommandArgs) { async runCommand(commandArgs: CommandArgs) {
@@ -315,7 +325,7 @@ export class Act {
// Initialize history for workspace // Initialize history for workspace
if (!this.historyManager.workspaceHistory[commandArgs.path]) { if (!this.historyManager.workspaceHistory[commandArgs.path]) {
this.historyManager.workspaceHistory[commandArgs.path] = []; this.historyManager.workspaceHistory[commandArgs.path] = [];
this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory); await this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory);
} }
// Process task count suffix // Process task count suffix
@@ -343,17 +353,21 @@ export class Act {
// Build command with settings // Build command with settings
const actCommand = Act.getActCommand(); const actCommand = Act.getActCommand();
const settings = await this.settingsManager.getSettings(workspaceFolder, true); const settings = await this.settingsManager.getSettings(workspaceFolder, true);
const command =
`${actCommand} ${Option.Json} ${commandArgs.options}` + const userOptions: string[] = [
(settings.secrets.length > 0 ? ` ${Option.Secret} ${settings.secrets.map(secret => secret.key).join(` ${Option.Secret} `)}` : ``) + ...settings.secrets.map(secret => `${Option.Secret} ${secret.key}`),
(settings.secretFiles.length > 0 ? ` ${Option.SecretFile} "${settings.secretFiles[0].path}"` : ` ${Option.SecretFile} ""`) + (settings.secretFiles.length > 0 ? `${Option.SecretFile} "${settings.secretFiles[0].path}"` : `${Option.SecretFile} ""`),
(settings.variables.length > 0 ? ` ${Option.Var} ${settings.variables.map(variable => `${variable.key}=${variable.value}`).join(` ${Option.Var} `)}` : ``) + ...settings.variables.map(variable => `${Option.Var} ${variable.key}=${variable.value}`),
(settings.variableFiles.length > 0 ? ` ${Option.VarFile} "${settings.variableFiles[0].path}"` : ` ${Option.VarFile} ""`) + (settings.variableFiles.length > 0 ? `${Option.VarFile} "${settings.variableFiles[0].path}"` : `${Option.VarFile} ""`),
(settings.inputs.length > 0 ? ` ${Option.Input} ${settings.inputs.map(input => `${input.key}=${input.value}`).join(` ${Option.Input} `)}` : ``) + ...settings.inputs.map(input => `${Option.Input} ${input.key}=${input.value}`),
(settings.inputFiles.length > 0 ? ` ${Option.InputFile} "${settings.inputFiles[0].path}"` : ` ${Option.InputFile} ""`) + (settings.inputFiles.length > 0 ? `${Option.InputFile} "${settings.inputFiles[0].path}"` : `${Option.InputFile} ""`),
(settings.runners.length > 0 ? ` ${Option.Platform} ${settings.runners.map(runner => `${runner.key}=${runner.value}`).join(` ${Option.Platform} `)}` : ``) + ...settings.runners.map(runner => `${Option.Platform} ${runner.key}=${runner.value}`),
(settings.payloadFiles.length > 0 ? ` ${Option.EventPath} "${settings.payloadFiles[0].path}"` : ` ${Option.EventPath} ""`) + (settings.payloadFiles.length > 0 ? `${Option.EventPath} "${settings.payloadFiles[0].path}"` : `${Option.EventPath} ""`),
(settings.options.map(option => option.path ? ` --${option.name} ${option.path}` : ` --${option.name}`).join('')); ...settings.options.map(option => option.path ? `--${option.name} ${option.path}` : `--${option.name}`)
];
const command = `${actCommand} ${Option.Json} ${commandArgs.options.join(' ')} ${userOptions.join(' ')}`;
const displayCommand = `${actCommand} ${commandArgs.options.join(' ')} ${userOptions.join(' ')}`;
// Execute task // Execute task
const taskExecution = await tasks.executeTask({ const taskExecution = await tasks.executeTask({
@@ -383,23 +397,6 @@ export class Act {
runOptions: {}, runOptions: {},
group: TaskGroup.Build, group: TaskGroup.Build,
execution: new CustomExecution(async (resolvedDefinition: TaskDefinition): Promise<Pseudoterminal> => { execution: new CustomExecution(async (resolvedDefinition: TaskDefinition): Promise<Pseudoterminal> => {
// Add new entry to workspace history
this.historyManager.workspaceHistory[commandArgs.path].push({
index: historyIndex,
count: count,
name: `${commandArgs.name}`,
status: HistoryStatus.Running,
date: {
start: start.toString()
},
taskExecution: taskExecution,
commandArgs: commandArgs,
logPath: logPath,
jobs: []
});
historyTreeDataProvider.refresh();
this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory);
const writeEmitter = new EventEmitter<string>(); const writeEmitter = new EventEmitter<string>();
const closeEmitter = new EventEmitter<number>(); const closeEmitter = new EventEmitter<number>();
@@ -417,9 +414,9 @@ export class Act {
} catch (error) { } } catch (error) { }
}); });
const handleIO = (data: any) => { const handleIO = async (data: any) => {
const lines: string[] = data.toString().split('\n').filter((line: string) => line !== ''); const lines: string[] = data.toString().split('\n').filter((line: string) => line !== '');
for (const line of lines) { for await (const line of lines) {
const dateString = new Date().toString(); const dateString = new Date().toString();
let message: string; let message: string;
@@ -507,9 +504,14 @@ export class Act {
} catch (error) { } catch (error) {
message = line; message = line;
} }
if (userOptions.includes(Option.Json)) {
message = line;
}
writeEmitter.fire(`${message.trimEnd()}\r\n`); writeEmitter.fire(`${message.trimEnd()}\r\n`);
historyTreeDataProvider.refresh(); historyTreeDataProvider.refresh();
this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory); await this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory);
} }
}; };
@@ -544,7 +546,7 @@ export class Act {
); );
exec.stdout.on('data', handleIO); exec.stdout.on('data', handleIO);
exec.stderr.on('data', handleIO); exec.stderr.on('data', handleIO);
exec.on('exit', (code, signal) => { exec.on('exit', async (code, signal) => {
const dateString = new Date().toString(); const dateString = new Date().toString();
// Set execution status and end time in workspace history // Set execution status and end time in workspace history
@@ -577,7 +579,7 @@ export class Act {
} }
this.historyManager.workspaceHistory[commandArgs.path][historyIndex].date.end = dateString; this.historyManager.workspaceHistory[commandArgs.path][historyIndex].date.end = dateString;
historyTreeDataProvider.refresh(); historyTreeDataProvider.refresh();
this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory); await this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory);
if (signal === 'SIGINT') { if (signal === 'SIGINT') {
writeEmitter.fire(`\r\nTask interrupted.\r\n`); writeEmitter.fire(`\r\nTask interrupted.\r\n`);
@@ -595,7 +597,7 @@ export class Act {
onDidWrite: writeEmitter.event, onDidWrite: writeEmitter.event,
onDidClose: closeEmitter.event, onDidClose: closeEmitter.event,
open: async (initialDimensions: TerminalDimensions | undefined): Promise<void> => { open: async (initialDimensions: TerminalDimensions | undefined): Promise<void> => {
writeEmitter.fire(`${command}\r\n\r\n`); writeEmitter.fire(`${displayCommand}\r\n\r\n`);
}, },
handleInput: (data: string) => { handleInput: (data: string) => {
if (data === '\x03') { if (data === '\x03') {
@@ -616,6 +618,23 @@ export class Act {
}; };
}) })
}); });
// Add new entry to workspace history
this.historyManager.workspaceHistory[commandArgs.path].push({
index: historyIndex,
count: count,
name: `${commandArgs.name}`,
status: HistoryStatus.Running,
date: {
start: start.toString()
},
taskExecution: taskExecution,
commandArgs: commandArgs,
logPath: logPath,
jobs: []
});
historyTreeDataProvider.refresh();
await this.storageManager.update(StorageKey.WorkspaceHistory, this.historyManager.workspaceHistory);
} }
async install(packageManager: string) { async install(packageManager: string) {

4
src/historyManager.ts
View File

@@ -90,7 +90,7 @@ export class HistoryManager {
this.workspaceHistory[workspaceFolder.uri.fsPath] = []; this.workspaceHistory[workspaceFolder.uri.fsPath] = [];
historyTreeDataProvider.refresh(); historyTreeDataProvider.refresh();
this.storageManager.update(StorageKey.WorkspaceHistory, this.workspaceHistory); await this.storageManager.update(StorageKey.WorkspaceHistory, this.workspaceHistory);
} }
async viewOutput(history: History) { async viewOutput(history: History) {
@@ -114,7 +114,7 @@ export class HistoryManager {
const historyIndex = this.workspaceHistory[history.commandArgs.path].findIndex(workspaceHistory => workspaceHistory.index === history.index); const historyIndex = this.workspaceHistory[history.commandArgs.path].findIndex(workspaceHistory => workspaceHistory.index === history.index);
if (historyIndex > -1) { if (historyIndex > -1) {
this.workspaceHistory[history.commandArgs.path].splice(historyIndex, 1); this.workspaceHistory[history.commandArgs.path].splice(historyIndex, 1);
this.storageManager.update(StorageKey.WorkspaceHistory, this.workspaceHistory); await this.storageManager.update(StorageKey.WorkspaceHistory, this.workspaceHistory);
try { try {
await workspace.fs.delete(Uri.file(history.logPath)); await workspace.fs.delete(Uri.file(history.logPath));

8
src/settingsManager.ts
View File

@@ -15,7 +15,7 @@ export interface Settings {
runners: Setting[]; runners: Setting[];
payloadFiles: CustomSetting[]; payloadFiles: CustomSetting[];
options: CustomSetting[]; options: CustomSetting[];
environments: Setting[]; // environments: Setting[];
} }
export interface Setting { export interface Setting {
@@ -74,7 +74,7 @@ export class SettingsManager {
const runners = (await this.getSetting(workspaceFolder, SettingsManager.runnersRegExp, StorageKey.Runners, false, Visibility.show)).filter(runner => !isUserSelected || (runner.selected && runner.value)); const runners = (await this.getSetting(workspaceFolder, SettingsManager.runnersRegExp, StorageKey.Runners, false, Visibility.show)).filter(runner => !isUserSelected || (runner.selected && runner.value));
const payloadFiles = (await this.getCustomSettings(workspaceFolder, StorageKey.PayloadFiles)).filter(payloadFile => !isUserSelected || payloadFile.selected); const payloadFiles = (await this.getCustomSettings(workspaceFolder, StorageKey.PayloadFiles)).filter(payloadFile => !isUserSelected || payloadFile.selected);
const options = (await this.getCustomSettings(workspaceFolder, StorageKey.Options)).filter(option => !isUserSelected || (option.selected && (option.path || option.notEditable))); const options = (await this.getCustomSettings(workspaceFolder, StorageKey.Options)).filter(option => !isUserSelected || (option.selected && (option.path || option.notEditable)));
const environments = await this.getEnvironments(workspaceFolder); // const environments = await this.getEnvironments(workspaceFolder);
return { return {
secrets: secrets, secrets: secrets,
@@ -86,7 +86,7 @@ export class SettingsManager {
runners: runners, runners: runners,
payloadFiles: payloadFiles, payloadFiles: payloadFiles,
options: options, options: options,
environments: environments // environments: environments
}; };
} }
@@ -131,7 +131,7 @@ export class SettingsManager {
} }
} }
existingSettings[workspaceFolder.uri.fsPath] = settings; existingSettings[workspaceFolder.uri.fsPath] = settings;
this.storageManager.update(storageKey, existingSettings); await this.storageManager.update(storageKey, existingSettings);
return settings; return settings;
} }