mirror of
https://github.com/opencloud-eu/opencloud.git
synced 2026-09-25 05:26:00 -04:00
build(deps): bump github.com/onsi/ginkgo/v2 from 2.32.1 to 2.33.0
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] <support@github.com>
This commit is contained in:
1 parent
f7e6d5d0dd
commit
60ce6dc484
10 files changed
+148
-31
No files matched your search
@@ -59,7 +59,7 @@ require (
|
||||
github.com/olekukonko/errors v1.3.0
|
||||
github.com/olekukonko/tablewriter v1.1.4
|
||||
github.com/onsi/ginkgo v1.16.5
|
||||
github.com/onsi/ginkgo/v2 v2.32.1
|
||||
github.com/onsi/ginkgo/v2 v2.33.0
|
||||
github.com/onsi/gomega v1.43.1
|
||||
github.com/open-policy-agent/opa v1.19.1
|
||||
github.com/opencloud-eu/icap-client v0.0.0-20250930132611-28a2afe62d89
|
||||
|
||||
@@ -915,8 +915,8 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
|
||||
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
|
||||
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.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
|
||||
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
|
||||
|
||||
+2
-1
@@ -6,4 +6,5 @@ integration/tmp_*/
|
||||
.vscode
|
||||
.idea/
|
||||
*.log
|
||||
*.test
|
||||
*.test
|
||||
/.release/
|
||||
+21
@@ -1,3 +1,24 @@
|
||||
## Unreleased
|
||||
|
||||
### Features
|
||||
|
||||
### Fixes
|
||||
|
||||
### Maintenance
|
||||
|
||||
## 2.33.0
|
||||
|
||||
### Features
|
||||
- The JUnit reporter now records each spec's `ReportEntry`s as `<properties>` on its `<testcase>` 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
|
||||
|
||||
+5
-2
@@ -1,6 +1,9 @@
|
||||

|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="docs/images/ginkgo-dark.png">
|
||||
<img alt="Ginkgo" src="docs/images/ginkgo.png">
|
||||
</picture>
|
||||
|
||||
[](https://github.com/onsi/ginkgo/actions?query=workflow%3Atest+branch%3Amaster) | [Ginkgo Docs](https://onsi.github.io/ginkgo/)
|
||||
[](https://github.com/onsi/ginkgo/actions/workflows/test.yml?query=branch%3Amaster) [](https://onsi.github.io/ginkgo/) [](https://github.com/sponsors/onsi)
|
||||
|
||||
---
|
||||
|
||||
|
||||
+84
-22
@@ -1,23 +1,85 @@
|
||||
A Ginkgo release is a tagged git sha and a GitHub release. To cut a release:
|
||||
# Releasing Ginkgo
|
||||
|
||||
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
|
||||
```
|
||||
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.
|
||||
+14
-1
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
+17
@@ -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 {
|
||||
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
package types
|
||||
|
||||
const VERSION = "2.32.1"
|
||||
const VERSION = "2.33.0"
|
||||
Vendored
+1
-1
@@ -1211,7 +1211,7 @@ github.com/onsi/ginkgo/reporters/stenographer
|
||||
github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
|
||||
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
|
||||
github.com/onsi/ginkgo/types
|
||||
# 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
|
||||
|
||||
Reference in new issue
Block a user