From 251dae5ccee92da9a0794c398456af0030d01b64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Sep 2026 07:43:55 +0000 Subject: [PATCH] Bump github.com/onsi/ginkgo/v2 from 2.32.1 to 2.33.0 in /tests Bumps [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo) from 2.32.1 to 2.33.0. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v2.32.1...v2.33.0) --- updated-dependencies: - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.33.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- tests/go.mod | 2 +- tests/go.sum | 4 +- .../github.com/onsi/ginkgo/v2/.gitignore | 3 +- .../github.com/onsi/ginkgo/v2/CHANGELOG.md | 21 ++++ .../github.com/onsi/ginkgo/v2/README.md | 7 +- .../github.com/onsi/ginkgo/v2/RELEASING.md | 108 ++++++++++++++---- .../parallel_support/server_handler.go | 15 ++- .../onsi/ginkgo/v2/reporters/junit_report.go | 17 +++ .../onsi/ginkgo/v2/types/version.go | 2 +- tests/vendor/modules.txt | 2 +- 10 files changed, 149 insertions(+), 32 deletions(-) diff --git a/tests/go.mod b/tests/go.mod index ef715e918a..9f9053fdd9 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -5,7 +5,7 @@ go 1.26.3 require ( github.com/gruntwork-io/terratest v0.47.2 github.com/mittwald/go-helm-client v0.13.2 - github.com/onsi/ginkgo/v2 v2.32.1 + github.com/onsi/ginkgo/v2 v2.33.0 github.com/onsi/gomega v1.42.1 github.com/stretchr/testify v1.12.0 helm.sh/helm/v4 v4.2.4 diff --git a/tests/go.sum b/tests/go.sum index 1a94dacd6d..55157467ba 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -285,8 +285,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.32.1 h1:6tlvcDm/3sE8lGJbZ4+d4mO3RLy24/tQWOFzVSQNIfw= -github.com/onsi/ginkgo/v2 v2.32.1/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= +github.com/onsi/ginkgo/v2 v2.33.0 h1:C8gBA6Uc2ZEubiV+SXiu5tZnMTwEmXHgkJwGozKtZf8= +github.com/onsi/ginkgo/v2 v2.33.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44= github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I= github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/.gitignore b/tests/vendor/github.com/onsi/ginkgo/v2/.gitignore index c9f0546204..54fe2bd1f0 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/.gitignore +++ b/tests/vendor/github.com/onsi/ginkgo/v2/.gitignore @@ -6,4 +6,5 @@ integration/tmp_*/ .vscode .idea/ *.log -*.test \ No newline at end of file +*.test +/.release/ diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 4d1ed9523c..396f97ce56 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/tests/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,24 @@ +## Unreleased + +### Features + +### Fixes + +### Maintenance + +## 2.33.0 + +### Features +- The JUnit reporter now records each spec's `ReportEntry`s as `` on its `` element, with the entry's name and its JSON-encoded value. Thanks @pohly! [23db51a] + +### Maintenance +- Releases are now cut by a GitHub Actions workflow (Actions -> Release -> Run workflow) rather than by hand, with changelog entries collected under `## Unreleased` as the work happens. See RELEASING.md. [8616ecb] + +## 2.32.2 + +### Fixes +- fix bug where ginkgo -race -p was taking extra long to exit [c6792b0] + ## 2.32.1 ### Fixes diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/README.md b/tests/vendor/github.com/onsi/ginkgo/v2/README.md index ad5e45f673..3d6583460b 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/README.md +++ b/tests/vendor/github.com/onsi/ginkgo/v2/README.md @@ -1,6 +1,9 @@ -![Ginkgo](https://onsi.github.io/ginkgo/images/ginkgo.png) + + + Ginkgo + -[![test](https://github.com/onsi/ginkgo/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/onsi/ginkgo/actions?query=workflow%3Atest+branch%3Amaster) | [Ginkgo Docs](https://onsi.github.io/ginkgo/) +[![test](https://github.com/onsi/ginkgo/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/onsi/ginkgo/actions/workflows/test.yml?query=branch%3Amaster) [![Ginkgo Docs](docs/images/docs-badge.svg)](https://onsi.github.io/ginkgo/) [![Sponsor onsi](docs/images/sponsor-badge.svg)](https://github.com/sponsors/onsi) --- diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/RELEASING.md b/tests/vendor/github.com/onsi/ginkgo/v2/RELEASING.md index 363815d7c7..559e7e52f0 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/RELEASING.md +++ b/tests/vendor/github.com/onsi/ginkgo/v2/RELEASING.md @@ -1,23 +1,85 @@ -A Ginkgo release is a tagged git sha and a GitHub release. To cut a release: - -1. Ensure CHANGELOG.md is up to date. - - Use - ```bash - LAST_VERSION=$(git tag --sort=version:refname | tail -n1) - CHANGES=$(git log --pretty=format:'- %s [%h]' HEAD...$LAST_VERSION) - echo -e "## NEXT\n\n$CHANGES\n\n### Features\n\n### Fixes\n\n### Maintenance\n\n$(cat CHANGELOG.md)" > CHANGELOG.md - ``` - to update the changelog - - Categorize the changes into - - Breaking Changes (requires a major version) - - New Features (minor version) - - Fixes (fix version) - - Maintenance (which in general should not be mentioned in `CHANGELOG.md` as they have no user impact) -1. Update `VERSION` in `types/version.go` -1. Commit, push, and release: - ``` - git commit -m "vM.m.p" - git push - gh release create "vM.m.p" - git fetch --tags origin master - ``` \ No newline at end of file +# Releasing Ginkgo + +A release is one GitHub Actions run: **Actions → Release → Run workflow → bump: patch | minor**, +from `master`. From the command line: + +```bash +gh workflow run release.yml -f bump=patch # or -f bump=minor +``` + +The run: + +1. Runs the whole test workflow (`test.yml`). Nothing else happens unless it passes. +2. Runs `scripts/release.sh`, which + - computes the next version from `VERSION` in `types/version.go`, + - renames `## Unreleased` in `CHANGELOG.md` to `## X.Y.Z` (dropping empty `###` subsections) and + puts a fresh, empty `## Unreleased` above it, + - writes `VERSION` and stamps the version into every plugin manifest + (`plugins/*/.claude-plugin/plugin.json`), so the Claude Code plugin ships in lockstep, + - commits `vX.Y.Z` as `github-actions[bot]`, tags it `vX.Y.Z`, and pushes the commit and the tag + together (`git push --atomic`, fast-forward only), + - creates the GitHub release `vX.Y.Z`, whose notes are the body of `## X.Y.Z`. + +The Go module is released by the `vX.Y.Z` tag. There is no other release tooling. + +## The changelog + +`CHANGELOG.md` starts with an `## Unreleased` section: + +```markdown +## Unreleased + +### Features + +### Fixes + +### Maintenance + +## 2.32.2 +... +``` + +Add an entry under `## Unreleased` with each user-facing change, as you make it. Never edit a +released section. Empty subsections are dropped when the section is released, so leaving +`### Maintenance` empty costs nothing. + +If `## Unreleased` has no entries (only blank lines and `###` headings), the release stops before +changing anything — and so does a re-run after a successful release. + +To draft entries from the commits since the last release: + +```bash +git log --pretty=format:'- %s [%h]' "$(git tag --sort=version:refname | tail -n1)"..HEAD +``` + +Categorize what you keep into + +- Breaking changes (these need a major version, which this workflow does not cut) +- `### Features` (minor version) +- `### Fixes` (patch version) +- `### Maintenance` (in general, changes with no user impact don't belong in the changelog at all) + +## If a release fails + +Open the failed run and click **Re-run failed jobs**. A re-run checks out the same commit as the +first attempt and computes the same version. It resumes based on what already exists: + +| Where it failed | What a re-run does | +|---|---| +| Tests, or before the push | Nothing reached GitHub. The re-run starts over. | +| The push (master moved during the run) | The re-run fails the same way. Start a new run from the current master. | +| After the push (the tag `vX.Y.Z` is on GitHub) | The re-run builds from the tag instead of making a new commit. | +| Creating the GitHub release | The release is created, or its notes are refreshed if it already exists. | + +The commit and the tag are pushed together, so the tag being on GitHub means the release commit is +on master too. + +## Trying the release script locally + +`GINKGO_RELEASE_DRY_RUN=1 scripts/release.sh patch` does the whole release locally — the changelog +and version rewrites, the commit and the tag — then skips the push and the GitHub release. It still +checks `origin` for an existing tag, so run it in a throwaway clone whose `origin` is a local bare +repository, not in your working copy. + +The version and changelog logic lives in `scripts/release`, with its own Ginkgo suite +(`scripts/release/release_test.go`) that runs with the rest of the suites. diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go b/tests/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go index ab9e11372c..360606517e 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go +++ b/tests/vendor/github.com/onsi/ginkgo/v2/internal/parallel_support/server_handler.go @@ -32,6 +32,7 @@ type ServerHandler struct { numSuiteDidBegins int numSuiteDidEnds int + procDidEnd []bool aggregatedReport types.Report reportHoldingArea []types.SpecReport } @@ -42,6 +43,7 @@ func newServerHandler(parallelTotal int, reporter reporters.Reporter) *ServerHan lock: &sync.Mutex{}, counterLock: &sync.Mutex{}, alives: make([]func() bool, parallelTotal), + procDidEnd: make([]bool, parallelTotal), beforeSuiteState: BeforeSuiteState{Data: nil, State: types.SpecStateInvalid}, parallelTotal: parallelTotal, @@ -90,6 +92,9 @@ func (handler *ServerHandler) SpecSuiteDidEnd(report types.Report, _ *Void) erro defer handler.lock.Unlock() handler.numSuiteDidEnds += 1 + if proc := report.SuiteConfig.ParallelProcess; proc >= 1 && proc <= handler.parallelTotal { + handler.procDidEnd[proc-1] = true + } if handler.numSuiteDidEnds == 1 { handler.aggregatedReport = report } else { @@ -133,9 +138,17 @@ func (handler *ServerHandler) procIsAlive(proc int) bool { return alive() } +func (handler *ServerHandler) procHasFinished(proc int) bool { + handler.lock.Lock() + didEnd := handler.procDidEnd[proc-1] + handler.lock.Unlock() + + return didEnd || !handler.procIsAlive(proc) +} + func (handler *ServerHandler) haveNonprimaryProcsFinished() bool { for i := 2; i <= handler.parallelTotal; i++ { - if handler.procIsAlive(i) { + if !handler.procHasFinished(i) { return false } } diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go b/tests/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go index d4720ee949..b7ef42c234 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go +++ b/tests/vendor/github.com/onsi/ginkgo/v2/reporters/junit_report.go @@ -11,6 +11,7 @@ The schema used for the generated JUnit xml file was adapted from https://llg.cu package reporters import ( + "encoding/json" "encoding/xml" "fmt" "maps" @@ -136,6 +137,8 @@ type JUnitTestCase struct { SystemOut string `xml:"system-out,omitempty"` //SystemOut maps onto any captured GinkgoWriter output - maps onto SpecReport.CapturedGinkgoWriterOutput SystemErr string `xml:"system-err,omitempty"` + //Properties captures any ReportEntries attached to the spec via AddReportEntry, as key/value pairs with the JSON dump of the value as value. + Properties *JUnitProperties `xml:"properties,omitempty"` } type JUnitSkipped struct { @@ -241,6 +244,20 @@ func GenerateJUnitReportWithConfig(report types.Report, dst string, config Junit if !config.OmitCapturedStdOutErr { test.SystemOut = systemOutForUnstructuredReporters(spec) } + if len(spec.ReportEntries) > 0 { + properties := JUnitProperties{} + for _, entry := range spec.ReportEntries { + value, err := json.Marshal(entry.GetRawValue()) + if err != nil { + value = []byte(fmt.Sprintf("%q", err.Error())) + } + properties.Properties = append(properties.Properties, JUnitProperty{ + Name: entry.Name, + Value: string(value), + }) + } + test.Properties = &properties + } suite.Tests += 1 switch spec.State { diff --git a/tests/vendor/github.com/onsi/ginkgo/v2/types/version.go b/tests/vendor/github.com/onsi/ginkgo/v2/types/version.go index 177baed9be..9fb4938e32 100644 --- a/tests/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/tests/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.32.1" +const VERSION = "2.33.0" diff --git a/tests/vendor/modules.txt b/tests/vendor/modules.txt index cd09afeb08..9d579e4cfb 100644 --- a/tests/vendor/modules.txt +++ b/tests/vendor/modules.txt @@ -429,7 +429,7 @@ github.com/monochromegane/go-gitignore # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 ## explicit github.com/munnerz/goautoneg -# github.com/onsi/ginkgo/v2 v2.32.1 +# github.com/onsi/ginkgo/v2 v2.33.0 ## explicit; go 1.25.0 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config