From fde5e7039d2aeeaed8f3b7c70742df52f17ab034 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Fri, 26 Apr 2024 18:09:25 -0400 Subject: [PATCH 1/3] update: show only cobuild build steps in the build timeline --- .../src/logic/operations/ConsoleTimelinePlugin.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts b/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts index beae3f7162d..9c89256257f 100644 --- a/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts +++ b/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts @@ -89,6 +89,13 @@ const TIMELINE_CHART_SYMBOLS: Record = { [OperationStatus.NoOp]: '%' }; +const COBUILD_REPORTABLE_STATUSES: Set = new Set([ + OperationStatus.Success, + OperationStatus.SuccessWithWarning, + OperationStatus.Failure, + OperationStatus.Blocked +]); + /** * Timeline - colorizer for each operation status */ @@ -234,7 +241,9 @@ export function _printTimeline({ terminal, result, cobuildConfiguration }: IPrin const { isExecuteByOtherCobuildRunner, status } = record; if (isExecuteByOtherCobuildRunner) { hasCobuildSymbol = true; - return 'C'; + if (COBUILD_REPORTABLE_STATUSES.has(status)) { + return 'C'; + } } return TIMELINE_CHART_SYMBOLS[status]; } From bedd947db47a703e0f74410705ff8eb8afbebfd8 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Mon, 29 Apr 2024 12:45:38 -0400 Subject: [PATCH 2/3] add changeset --- .../sennyeya-fix-cobuild-symbols_2024-04-29-16-45.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 common/changes/@microsoft/rush/sennyeya-fix-cobuild-symbols_2024-04-29-16-45.json diff --git a/common/changes/@microsoft/rush/sennyeya-fix-cobuild-symbols_2024-04-29-16-45.json b/common/changes/@microsoft/rush/sennyeya-fix-cobuild-symbols_2024-04-29-16-45.json new file mode 100644 index 00000000000..3d5a49be109 --- /dev/null +++ b/common/changes/@microsoft/rush/sennyeya-fix-cobuild-symbols_2024-04-29-16-45.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@microsoft/rush", + "comment": "Timeline view will now only show terminal build statuses as cobuilt, all other statuses will reflect their original icons.", + "type": "none" + } + ], + "packageName": "@microsoft/rush" +} \ No newline at end of file From 030c7a778d1d371e1d59978f4c95bb189823cd16 Mon Sep 17 00:00:00 2001 From: Aramis Sennyey Date: Tue, 30 Apr 2024 09:53:48 -0400 Subject: [PATCH 3/3] only show symbol when symbol is set --- .../rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts b/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts index 9c89256257f..c600475ec4d 100644 --- a/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts +++ b/libraries/rush-lib/src/logic/operations/ConsoleTimelinePlugin.ts @@ -239,11 +239,9 @@ export function _printTimeline({ terminal, result, cobuildConfiguration }: IPrin function getChartSymbol(record: ITimelineRecord): string { const { isExecuteByOtherCobuildRunner, status } = record; - if (isExecuteByOtherCobuildRunner) { + if (isExecuteByOtherCobuildRunner && COBUILD_REPORTABLE_STATUSES.has(status)) { hasCobuildSymbol = true; - if (COBUILD_REPORTABLE_STATUSES.has(status)) { - return 'C'; - } + return 'C'; } return TIMELINE_CHART_SYMBOLS[status]; }