diff --git a/assets/catnip/go.mod b/assets/catnip/go.mod index a245b8958..52277b900 100644 --- a/assets/catnip/go.mod +++ b/assets/catnip/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( code.cloudfoundry.org/clock v1.1.0 github.com/go-chi/chi/v5 v5.0.12 - github.com/onsi/ginkgo/v2 v2.17.2 + github.com/onsi/ginkgo/v2 v2.17.3 github.com/onsi/gomega v1.33.1 ) diff --git a/assets/catnip/go.sum b/assets/catnip/go.sum index 446543fda..9bd711db5 100644 --- a/assets/catnip/go.sum +++ b/assets/catnip/go.sum @@ -17,8 +17,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g= -github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= diff --git a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md index 0a8949799..13be7ec6a 100644 --- a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md +++ b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.17.3 + +### Fixes +`ginkgo watch` now ignores hidden files [bde6e00] + ## 2.17.2 ### Fixes diff --git a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go index 17d052bdc..0e6ae1f29 100644 --- a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go +++ b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/ginkgo/watch/package_hash.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "regexp" + "strings" "time" ) @@ -79,6 +80,10 @@ func (p *PackageHash) computeHashes() (codeHash string, codeModifiedTime time.Ti continue } + if isHiddenFile(info) { + continue + } + if goTestRegExp.MatchString(info.Name()) { testHash += p.hashForFileInfo(info) if info.ModTime().After(testModifiedTime) { @@ -103,6 +108,10 @@ func (p *PackageHash) computeHashes() (codeHash string, codeModifiedTime time.Ti return } +func isHiddenFile(info os.FileInfo) bool { + return strings.HasPrefix(info.Name(), ".") || strings.HasPrefix(info.Name(), "_") +} + func (p *PackageHash) hashForFileInfo(info os.FileInfo) string { return fmt.Sprintf("%s_%d_%d", info.Name(), info.Size(), info.ModTime().UnixNano()) } diff --git a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/types/version.go b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/types/version.go index 5dd0140cd..52cc3abc8 100644 --- a/assets/catnip/vendor/github.com/onsi/ginkgo/v2/types/version.go +++ b/assets/catnip/vendor/github.com/onsi/ginkgo/v2/types/version.go @@ -1,3 +1,3 @@ package types -const VERSION = "2.17.2" +const VERSION = "2.17.3" diff --git a/assets/catnip/vendor/modules.txt b/assets/catnip/vendor/modules.txt index 7d3daa0e4..ae932951e 100644 --- a/assets/catnip/vendor/modules.txt +++ b/assets/catnip/vendor/modules.txt @@ -25,7 +25,7 @@ github.com/google/go-cmp/cmp/internal/value github.com/google/pprof/profile # github.com/kr/pretty v0.1.0 ## explicit -# github.com/onsi/ginkgo/v2 v2.17.2 +# github.com/onsi/ginkgo/v2 v2.17.3 ## explicit; go 1.20 github.com/onsi/ginkgo/v2 github.com/onsi/ginkgo/v2/config