Skip to content

Commit

Permalink
feat(core): split runCommand to return status per project (#27705)
Browse files Browse the repository at this point in the history
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

<!-- If this is a particularly complex change or feature addition, you
can request a dedicated Nx release for this pull request branch. Mention
someone from the Nx team or the `@nrwl/nx-pipelines-reviewers` and they
will confirm if the PR warrants its own release for testing purposes,
and generate it for you if appropriate. -->

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
  • Loading branch information
xiongemi authored Sep 17, 2024
1 parent 91e3ac0 commit cf1ffde
Show file tree
Hide file tree
Showing 9 changed files with 133 additions and 125 deletions.
13 changes: 9 additions & 4 deletions packages/nx/src/tasks-runner/init-tasks-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export async function initTasksRunner(nxArgs: NxArgs) {
tasks: Task[];
parallel: number;
}): Promise<{
status: number;
status: NodeJS.Process['exitCode'];
taskGraph: TaskGraph;
taskResults: Record<string, TaskResult>;
}> => {
Expand All @@ -51,7 +51,7 @@ export async function initTasksRunner(nxArgs: NxArgs) {
}, {} as any),
};

const status = await invokeTasksRunner({
const taskResults = await invokeTasksRunner({
tasks: opts.tasks,
projectGraph,
taskGraph,
Expand All @@ -63,9 +63,14 @@ export async function initTasksRunner(nxArgs: NxArgs) {
});

return {
status,
status: Object.values(taskResults).some(
(taskResult) =>
taskResult.status === 'failure' || taskResult.status === 'skipped'
)
? 1
: 0,
taskGraph,
taskResults: lifeCycle.getTaskResults(),
taskResults,
};
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { Task } from '../../config/task-graph';
export class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle {
failedTasks = [] as Task[];
cachedTasks = [] as Task[];
private taskResults = {} as Record<string, TaskResult>;

constructor(private readonly tasks: Task[]) {}

Expand Down Expand Up @@ -56,7 +55,6 @@ export class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle {

endTasks(taskResults: TaskResult[]): void {
for (let t of taskResults) {
this.taskResults[t.task.id] = t;
if (t.status === 'failure') {
this.failedTasks.push(t.task);
} else if (t.status === 'local-cache') {
Expand All @@ -77,8 +75,4 @@ export class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle {
const args = getPrintableCommandArgsForTask(task);
output.logCommandOutput(args.join(' '), cacheStatus, terminalOutput);
}

getTaskResults() {
return this.taskResults;
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { output } from '../../utils/output';
import { TaskStatus } from '../tasks-runner';
import { getPrintableCommandArgsForTask } from '../utils';
import type { LifeCycle } from '../life-cycle';
import type { LifeCycle, TaskResult } from '../life-cycle';
import { Task } from '../../config/task-graph';
import { formatFlags, formatTargetsAndProjects } from './formatting-utils';

Expand Down Expand Up @@ -126,9 +126,7 @@ export class StaticRunManyTerminalOutputLifeCycle implements LifeCycle {
return this.tasks.filter((t) => !this.allCompletedTasks.has(t.id));
}

endTasks(
taskResults: { task: Task; status: TaskStatus; code: number }[]
): void {
endTasks(taskResults: TaskResult[]): void {
for (let t of taskResults) {
this.allCompletedTasks.set(t.task.id, t.task);
if (t.status === 'failure') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { output } from '../../utils/output';
import { TaskStatus } from '../tasks-runner';
import { getPrintableCommandArgsForTask } from '../utils';
import type { LifeCycle } from '../life-cycle';
import type { LifeCycle, TaskResult } from '../life-cycle';
import { Task } from '../../config/task-graph';
import { formatTargetsAndProjects } from './formatting-utils';

Expand Down Expand Up @@ -90,9 +90,7 @@ export class StaticRunOneTerminalOutputLifeCycle implements LifeCycle {
}
}

endTasks(
taskResults: { task: Task; status: TaskStatus; code: number }[]
): void {
endTasks(taskResults: TaskResult[]): void {
for (let t of taskResults) {
if (t.status === 'failure') {
this.failedTasks.push(t.task);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { parse, join } from 'path';
import { writeFileSync } from 'fs';
import { LifeCycle } from '../../tasks-runner/life-cycle';
import { LifeCycle, TaskResult } from '../../tasks-runner/life-cycle';
import { Task } from '../../config/task-graph';
import { TaskStatus } from '../../tasks-runner/tasks-runner';
import { cacheDir } from '../../utils/cache-directory';
Expand Down Expand Up @@ -36,9 +36,7 @@ export class StoreRunInformationLifeCycle implements LifeCycle {
}
}

endTasks(
taskResults: Array<{ task: Task; status: TaskStatus; code: number }>
): void {
endTasks(taskResults: TaskResult[]): void {
for (let tr of taskResults) {
if (tr.task.startTime) {
this.timings[tr.task.id].start = new Date(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LifeCycle, TaskMetadata } from '../life-cycle';
import { LifeCycle, TaskMetadata, TaskResult } from '../life-cycle';
import { TaskStatus } from '../tasks-runner';

import { performance } from 'perf_hooks';
Expand Down Expand Up @@ -32,10 +32,7 @@ export class TaskProfilingLifeCycle implements LifeCycle {
}
}

endTasks(
taskResults: Array<{ task: Task; status: TaskStatus; code: number }>,
metadata: TaskMetadata
): void {
endTasks(taskResults: TaskResult[], metadata: TaskMetadata): void {
for (let tr of taskResults) {
if (tr.task.startTime) {
this.timings[tr.task.id].perfStart = tr.task.startTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { LifeCycle, TaskResult } from '../life-cycle';

export class TaskResultsLifeCycle implements LifeCycle {
private taskResults = {} as Record<string, TaskResult>;

endTasks(taskResults: TaskResult[]): void {
for (let t of taskResults) {
this.taskResults[t.task.id] = t;
}
}

getTaskResults(): Record<string, TaskResult> {
return this.taskResults;
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Task } from '../../config/task-graph';
import { LifeCycle } from '../life-cycle';
import { LifeCycle, TaskResult } from '../life-cycle';
import { TaskStatus } from '../tasks-runner';

export class TaskTimingsLifeCycle implements LifeCycle {
Expand All @@ -19,13 +19,7 @@ export class TaskTimingsLifeCycle implements LifeCycle {
}
}

endTasks(
taskResults: Array<{
task: Task;
status: TaskStatus;
code: number;
}>
): void {
endTasks(taskResults: TaskResult[]): void {
for (let tr of taskResults) {
if (tr.task.startTime) {
this.timings[tr.task.id].start = tr.task.startTime;
Expand Down
Loading

0 comments on commit cf1ffde

Please sign in to comment.