Skip to content

Commit f01aed1

Browse files
koct9ionsi
koct9i
authored and
onsi
committed
emit --github-output group only for progress report itself
Do not emit group when progress report is nested in timeline or failure. Unfortunately github logging does not handle nested groups correctly. Link: actions/toolkit#1001
1 parent df6d755 commit f01aed1

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

‎reporters/default_reporter.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ func (r *DefaultReporter) emitTimeline(indent uint, report types.SpecReport, tim
404404
case types.ReportEntry:
405405
r.emitReportEntry(indent, x)
406406
case types.ProgressReport:
407-
r.emitProgressReport(indent, false, x)
407+
r.emitProgressReport(indent, false, false, x)
408408
case types.SpecEvent:
409409
if isVeryVerbose || !x.IsOnlyVisibleAtVeryVerbose() || r.conf.ShowNodeEvents {
410410
r.emitSpecEvent(indent, x, isVeryVerbose)
@@ -458,7 +458,7 @@ func (r *DefaultReporter) emitFailure(indent uint, state types.SpecState, failur
458458

459459
if !failure.ProgressReport.IsZero() {
460460
r.emitBlock("\n")
461-
r.emitProgressReport(indent, false, failure.ProgressReport)
461+
r.emitProgressReport(indent, false, false, failure.ProgressReport)
462462
}
463463

464464
if failure.AdditionalFailure != nil && includeAdditionalFailure {
@@ -474,11 +474,11 @@ func (r *DefaultReporter) EmitProgressReport(report types.ProgressReport) {
474474
r.emit(r.fi(1, "{{coral}}Progress Report for Ginkgo Process #{{bold}}%d{{/}}\n", report.ParallelProcess))
475475
}
476476
shouldEmitGW := report.RunningInParallel || r.conf.Verbosity().LT(types.VerbosityLevelVerbose)
477-
r.emitProgressReport(1, shouldEmitGW, report)
477+
r.emitProgressReport(1, shouldEmitGW, true, report)
478478
r.emitDelimiter(1)
479479
}
480480

481-
func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput bool, report types.ProgressReport) {
481+
func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput, emitGroup bool, report types.ProgressReport) {
482482
if report.Message != "" {
483483
r.emitBlock(r.fi(indent, report.Message+"\n"))
484484
indent += 1
@@ -514,7 +514,7 @@ func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput
514514
indent -= 1
515515
}
516516

517-
if r.conf.GithubOutput {
517+
if r.conf.GithubOutput && emitGroup {
518518
r.emitBlock(r.fi(indent, "::group::Progress Report"))
519519
}
520520

@@ -565,7 +565,7 @@ func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput
565565
r.emitGoroutines(indent, otherGoroutines...)
566566
}
567567

568-
if r.conf.GithubOutput {
568+
if r.conf.GithubOutput && emitGroup {
569569
r.emitBlock(r.fi(indent, "::endgroup::"))
570570
}
571571
}

0 commit comments

Comments
 (0)