fix(deps): update module github.com/onsi/ginkgo/v2 to v2.25.1

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
renovate[bot]
2025-08-22 06:31:44 +00:00
committed by GitHub
parent 3548ae1caf
commit 18aa78a7e6
8 changed files with 26 additions and 11 deletions

2
go.mod
View File

@ -50,7 +50,7 @@ require (
github.com/moby/sys/user v0.4.0 github.com/moby/sys/user v0.4.0
github.com/moby/term v0.5.2 github.com/moby/term v0.5.2
github.com/nxadm/tail v1.4.11 github.com/nxadm/tail v1.4.11
github.com/onsi/ginkgo/v2 v2.25.0 github.com/onsi/ginkgo/v2 v2.25.1
github.com/onsi/gomega v1.38.0 github.com/onsi/gomega v1.38.0
github.com/opencontainers/cgroups v0.0.4 github.com/opencontainers/cgroups v0.0.4
github.com/opencontainers/go-digest v1.0.0 github.com/opencontainers/go-digest v1.0.0

4
go.sum
View File

@ -320,8 +320,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY= github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc= github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
github.com/onsi/ginkgo/v2 v2.25.0 h1:LJu94oDZUdgnw+GD0Sk/iwG9c5Fnr1vLgMb4FUUwWxE= github.com/onsi/ginkgo/v2 v2.25.1 h1:Fwp6crTREKM+oA6Cz4MsO8RhKQzs2/gOIVOUscMAfZY=
github.com/onsi/ginkgo/v2 v2.25.0/go.mod h1:ppTWQ1dh9KM/F1XgpeRqelR+zHVwV81DGRSDnFxK7Sk= github.com/onsi/ginkgo/v2 v2.25.1/go.mod h1:ppTWQ1dh9KM/F1XgpeRqelR+zHVwV81DGRSDnFxK7Sk=
github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY= github.com/onsi/gomega v1.38.0 h1:c/WX+w8SLAinvuKKQFh77WEucCnPk4j2OTUr7lt7BeY=
github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o= github.com/onsi/gomega v1.38.0/go.mod h1:OcXcwId0b9QsE7Y49u+BTrL4IdKOBOKnD6VQNTJEB6o=
github.com/opencontainers/cgroups v0.0.4 h1:XVj8P/IHVms/j+7eh8ggdkTLAxjz84ZzuFyGoE28DR4= github.com/opencontainers/cgroups v0.0.4 h1:XVj8P/IHVms/j+7eh8ggdkTLAxjz84ZzuFyGoE28DR4=

View File

@ -1,3 +1,9 @@
## 2.25.1
### Fixes
- fix(types): ignore nameless nodes on FullText() [10866d3]
- chore: fix some CodeQL warnings [2e42cff]
## 2.25.0 ## 2.25.0
### `AroundNode` ### `AroundNode`

View File

@ -2,12 +2,9 @@ package watch
import ( import (
"go/build" "go/build"
"regexp" "strings"
) )
var ginkgoAndGomegaFilter = regexp.MustCompile(`github\.com/onsi/ginkgo|github\.com/onsi/gomega`)
var ginkgoIntegrationTestFilter = regexp.MustCompile(`github\.com/onsi/ginkgo/integration`) //allow us to integration test this thing
type Dependencies struct { type Dependencies struct {
deps map[string]int deps map[string]int
} }
@ -78,7 +75,7 @@ func (d Dependencies) resolveAndAdd(deps []string, depth int) {
if err != nil { if err != nil {
continue continue
} }
if !pkg.Goroot && (!ginkgoAndGomegaFilter.MatchString(pkg.Dir) || ginkgoIntegrationTestFilter.MatchString(pkg.Dir)) { if !pkg.Goroot && (!matchesGinkgoOrGomega(pkg.Dir) || matchesGinkgoIntegration(pkg.Dir)) {
d.addDepIfNotPresent(pkg.Dir, depth) d.addDepIfNotPresent(pkg.Dir, depth)
} }
} }
@ -90,3 +87,11 @@ func (d Dependencies) addDepIfNotPresent(dep string, depth int) {
d.deps[dep] = depth d.deps[dep] = depth
} }
} }
func matchesGinkgoOrGomega(s string) bool {
return strings.Contains(s, "github.com/onsi/ginkgo") || strings.Contains(s, "github.com/onsi/gomega")
}
func matchesGinkgoIntegration(s string) bool {
return strings.Contains(s, "github.com/onsi/ginkgo/integration") // allow us to integration test this thing
}

View File

@ -236,7 +236,7 @@ func extractRunningGoroutines() ([]types.Goroutine, error) {
} }
functionCall.Filename = line[:delimiterIdx] functionCall.Filename = line[:delimiterIdx]
line = strings.Split(line[delimiterIdx+1:], " ")[0] line = strings.Split(line[delimiterIdx+1:], " ")[0]
lineNumber, err := strconv.ParseInt(line, 10, 64) lineNumber, err := strconv.ParseInt(line, 10, 32)
functionCall.Line = int(lineNumber) functionCall.Line = int(lineNumber)
if err != nil { if err != nil {
return nil, types.GinkgoErrors.FailedToParseStackTrace(fmt.Sprintf("Invalid function call line number: %s\n%s", line, err.Error())) return nil, types.GinkgoErrors.FailedToParseStackTrace(fmt.Sprintf("Invalid function call line number: %s\n%s", line, err.Error()))

View File

@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os" "os"
"slices"
"sort" "sort"
"strings" "strings"
"time" "time"
@ -299,6 +300,9 @@ func (report SpecReport) FullText() string {
if report.LeafNodeText != "" { if report.LeafNodeText != "" {
texts = append(texts, report.LeafNodeText) texts = append(texts, report.LeafNodeText)
} }
texts = slices.DeleteFunc(texts, func(t string) bool {
return t == ""
})
return strings.Join(texts, " ") return strings.Join(texts, " ")
} }

View File

@ -1,3 +1,3 @@
package types package types
const VERSION = "2.25.0" const VERSION = "2.25.1"

2
vendor/modules.txt vendored
View File

@ -706,7 +706,7 @@ github.com/nxadm/tail/ratelimiter
github.com/nxadm/tail/util github.com/nxadm/tail/util
github.com/nxadm/tail/watch github.com/nxadm/tail/watch
github.com/nxadm/tail/winfile github.com/nxadm/tail/winfile
# github.com/onsi/ginkgo/v2 v2.25.0 # github.com/onsi/ginkgo/v2 v2.25.1
## explicit; go 1.23.0 ## explicit; go 1.23.0
github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2
github.com/onsi/ginkgo/v2/config github.com/onsi/ginkgo/v2/config