From 8b294c8641574d52337f87c76528b45cd09b37ad Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 19:56:56 +0000 Subject: [PATCH] fix(deps): update module github.com/onsi/ginkgo/v2 to v2.25.3 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- verify/go.mod | 2 +- verify/go.sum | 4 ++-- verify/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md | 6 ++++++ .../onsi/ginkgo/v2/reporters/default_reporter.go | 12 ++++++------ .../github.com/onsi/ginkgo/v2/types/version.go | 2 +- verify/vendor/modules.txt | 2 +- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/verify/go.mod b/verify/go.mod index 3feae9ae..96941010 100644 --- a/verify/go.mod +++ b/verify/go.mod @@ -3,7 +3,7 @@ module github.com/containers/podman-machine-os go 1.23.0 require ( - github.com/onsi/ginkgo/v2 v2.25.2 + github.com/onsi/ginkgo/v2 v2.25.3 github.com/onsi/gomega v1.38.2 ) diff --git a/verify/go.sum b/verify/go.sum index 220afb6b..64bdefe0 100644 --- a/verify/go.sum +++ b/verify/go.sum @@ -14,8 +14,8 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/onsi/ginkgo/v2 v2.25.2 h1:hepmgwx1D+llZleKQDMEvy8vIlCxMGt7W5ZxDjIEhsw= -github.com/onsi/ginkgo/v2 v2.25.2/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= +github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw= +github.com/onsi/ginkgo/v2 v2.25.3/go.mod h1:43uiyQC4Ed2tkOzLsEYm7hnrb7UJTWHYNsuy3bG/snE= github.com/onsi/gomega v1.38.2 h1:eZCjf2xjZAqe+LeWvKb5weQ+NcPwX84kqJ0cZNxok2A= github.com/onsi/gomega v1.38.2/go.mod h1:W2MJcYxRGV63b418Ai34Ud0hEdTVXq9NW9+Sx6uXf3k= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/verify/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/verify/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 1c4d5329..0e5f2378 100644 --- a/verify/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/verify/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.25.3 + +### Fixes + +- emit --github-output group only for progress report itself [f01aed1] + ## 2.25.2 ### Fixes diff --git a/verify/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go b/verify/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go index 637232b2..8c3714b8 100644 --- a/verify/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go +++ b/verify/vendor/github.com/onsi/ginkgo/v2/reporters/default_reporter.go @@ -404,7 +404,7 @@ func (r *DefaultReporter) emitTimeline(indent uint, report types.SpecReport, tim case types.ReportEntry: r.emitReportEntry(indent, x) case types.ProgressReport: - r.emitProgressReport(indent, false, x) + r.emitProgressReport(indent, false, false, x) case types.SpecEvent: if isVeryVerbose || !x.IsOnlyVisibleAtVeryVerbose() || r.conf.ShowNodeEvents { r.emitSpecEvent(indent, x, isVeryVerbose) @@ -458,7 +458,7 @@ func (r *DefaultReporter) emitFailure(indent uint, state types.SpecState, failur if !failure.ProgressReport.IsZero() { r.emitBlock("\n") - r.emitProgressReport(indent, false, failure.ProgressReport) + r.emitProgressReport(indent, false, false, failure.ProgressReport) } if failure.AdditionalFailure != nil && includeAdditionalFailure { @@ -474,11 +474,11 @@ func (r *DefaultReporter) EmitProgressReport(report types.ProgressReport) { r.emit(r.fi(1, "{{coral}}Progress Report for Ginkgo Process #{{bold}}%d{{/}}\n", report.ParallelProcess)) } shouldEmitGW := report.RunningInParallel || r.conf.Verbosity().LT(types.VerbosityLevelVerbose) - r.emitProgressReport(1, shouldEmitGW, report) + r.emitProgressReport(1, shouldEmitGW, true, report) r.emitDelimiter(1) } -func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput bool, report types.ProgressReport) { +func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput, emitGroup bool, report types.ProgressReport) { if report.Message != "" { r.emitBlock(r.fi(indent, report.Message+"\n")) indent += 1 @@ -514,7 +514,7 @@ func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput indent -= 1 } - if r.conf.GithubOutput { + if r.conf.GithubOutput && emitGroup { r.emitBlock(r.fi(indent, "::group::Progress Report")) } @@ -565,7 +565,7 @@ func (r *DefaultReporter) emitProgressReport(indent uint, emitGinkgoWriterOutput r.emitGoroutines(indent, otherGoroutines...) } - if r.conf.GithubOutput { + if r.conf.GithubOutput && emitGroup { r.emitBlock(r.fi(indent, "::endgroup::")) } } diff --git a/verify/vendor/github.com/onsi/ginkgo/v2/types/version.go b/verify/vendor/github.com/onsi/ginkgo/v2/types/version.go index 49f4a94a..6aca6efa 100644 --- a/verify/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/verify/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.25.2" +const VERSION = "2.25.3" diff --git a/verify/vendor/modules.txt b/verify/vendor/modules.txt index 0adb7b6b..e0b8d17c 100644 --- a/verify/vendor/modules.txt +++ b/verify/vendor/modules.txt @@ -18,7 +18,7 @@ github.com/google/go-cmp/cmp/internal/value # github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 ## explicit; go 1.23 github.com/google/pprof/profile -# github.com/onsi/ginkgo/v2 v2.25.2 +# github.com/onsi/ginkgo/v2 v2.25.3 ## explicit; go 1.23.0 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config