From 7f315356737ada8e1e1b39656eb032543b879b70 Mon Sep 17 00:00:00 2001 From: Ken Date: Mon, 17 Apr 2023 14:59:11 -0700 Subject: [PATCH 1/2] show progress better --- packages/reporters/src/ProgressReporter.ts | 6 ++++++ packages/scheduler/src/SimpleScheduler.ts | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/packages/reporters/src/ProgressReporter.ts b/packages/reporters/src/ProgressReporter.ts index d3b2bc85b..f0e1fd48c 100644 --- a/packages/reporters/src/ProgressReporter.ts +++ b/packages/reporters/src/ProgressReporter.ts @@ -83,6 +83,12 @@ export class ProgressReporter implements Reporter { if (entry.data && entry.data.schedulerRun) { this.startTime = entry.data.schedulerRun.startTime; + const { targets } = entry.data.schedulerRun; + + for (const target of targets) { + const task = this.taskReporter.addTask(target.label, true); + this.tasks.set(target.id, task); + } } if (entry.data && entry.data.status && entry.data.target) { diff --git a/packages/scheduler/src/SimpleScheduler.ts b/packages/scheduler/src/SimpleScheduler.ts index a68f5ebe8..322b6e377 100644 --- a/packages/scheduler/src/SimpleScheduler.ts +++ b/packages/scheduler/src/SimpleScheduler.ts @@ -89,16 +89,17 @@ export class SimpleScheduler implements TargetScheduler { const { continueOnError, logger, shouldCache } = this.options; + const { pool, abortController } = this; + + const { targets } = targetGraph; + logger.verbose("", { schedulerRun: { startTime, + targets: [...targets.values()].filter((t) => !t.hidden).map((t) => ({ id: t.id, label: t.label })), }, }); - const { pool, abortController } = this; - - const { targets } = targetGraph; - for (const target of targets.values()) { let targetRun: WrappedTarget; @@ -253,6 +254,12 @@ export class SimpleScheduler implements TargetScheduler { await Promise.all(promises); } + logTargets() { + this.options.logger.verbose("", { + targets: [...this.targetRuns.values()].map((t) => ({ id: t.target.id, label: t.target.label })), + }); + } + logProgress() { const targetRunByStatus = categorizeTargetRuns(this.targetRuns.values()); const total = [...this.targetRuns.values()].filter((t) => !t.target.hidden).length; From b112f26817f54d12f1cc330a326d58ec4588d1a4 Mon Sep 17 00:00:00 2001 From: Ken Date: Mon, 17 Apr 2023 15:13:24 -0700 Subject: [PATCH 2/2] Change files --- ...run-reporters-ec358b22-2d11-44ac-bfd9-a8c16e19483a.json | 7 +++++++ ...run-scheduler-defa2a2c-7b70-4a6e-ac76-cb7ab12358a5.json | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 change/@lage-run-reporters-ec358b22-2d11-44ac-bfd9-a8c16e19483a.json create mode 100644 change/@lage-run-scheduler-defa2a2c-7b70-4a6e-ac76-cb7ab12358a5.json diff --git a/change/@lage-run-reporters-ec358b22-2d11-44ac-bfd9-a8c16e19483a.json b/change/@lage-run-reporters-ec358b22-2d11-44ac-bfd9-a8c16e19483a.json new file mode 100644 index 000000000..99817d80d --- /dev/null +++ b/change/@lage-run-reporters-ec358b22-2d11-44ac-bfd9-a8c16e19483a.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "show progress better", + "packageName": "@lage-run/reporters", + "email": "kchau@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/change/@lage-run-scheduler-defa2a2c-7b70-4a6e-ac76-cb7ab12358a5.json b/change/@lage-run-scheduler-defa2a2c-7b70-4a6e-ac76-cb7ab12358a5.json new file mode 100644 index 000000000..b4b0ffd2b --- /dev/null +++ b/change/@lage-run-scheduler-defa2a2c-7b70-4a6e-ac76-cb7ab12358a5.json @@ -0,0 +1,7 @@ +{ + "type": "patch", + "comment": "show progress better", + "packageName": "@lage-run/scheduler", + "email": "kchau@microsoft.com", + "dependentChangeType": "patch" +}