diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 362b8537f8..adf3b06bf0 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -89,7 +89,7 @@ }, "osvVulnerabilityAlerts": true, "prConcurrentLimit": 10, - "rebaseWhen": "conflicted", + "rebaseWhen": "auto", "branchPrefix": "deps-update/", "postUpdateOptions": [ "gomodTidy" diff --git a/go.mod b/go.mod index 0c46a0aaba..78252a4e3c 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible github.com/aws/aws-sdk-go v1.55.6 github.com/baidubce/bce-sdk-go v0.9.215 - github.com/bmatcuk/doublestar/v4 v4.8.0 + github.com/bmatcuk/doublestar/v4 v4.8.1 github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 github.com/cespare/xxhash/v2 v2.3.0 github.com/containerd/fifo v1.1.0 diff --git a/go.sum b/go.sum index 196e5be89f..fe4e54ea6f 100644 --- a/go.sum +++ b/go.sum @@ -238,8 +238,8 @@ github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2io github.com/bitly/go-hostpool v0.1.0/go.mod h1:4gOCgp6+NZnVqlKyZ/iBZFTAJKembaVENUpMkpg42fw= github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= -github.com/bmatcuk/doublestar/v4 v4.8.0 h1:DSXtrypQddoug1459viM9X9D3dp1Z7993fw36I2kNcQ= -github.com/bmatcuk/doublestar/v4 v4.8.0/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= +github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38= +github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= diff --git a/vendor/github.com/bmatcuk/doublestar/v4/README.md b/vendor/github.com/bmatcuk/doublestar/v4/README.md index 2e88266eff..b417a2c453 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/README.md +++ b/vendor/github.com/bmatcuk/doublestar/v4/README.md @@ -376,8 +376,9 @@ Character classes support the following: Class | Meaning ---------- | ------- -`[abc]` | matches any single character within the set -`[a-z]` | matches any single character in the range +`[abc123]` | matches any single character within the set +`[a-z0-9]` | matches any single character in the range a-z or 0-9 +`[125-79]` | matches any single character within the set 129, or the range 5-7 `[^class]` | matches any single character which does *not* match the class `[!class]` | same as `^`: negates the class diff --git a/vendor/github.com/bmatcuk/doublestar/v4/match.go b/vendor/github.com/bmatcuk/doublestar/v4/match.go index c0f20afa43..a21259db46 100644 --- a/vendor/github.com/bmatcuk/doublestar/v4/match.go +++ b/vendor/github.com/bmatcuk/doublestar/v4/match.go @@ -319,10 +319,10 @@ MATCH: // we've reached the end of `name`; we've successfully matched if we've also // reached the end of `pattern`, or if the rest of `pattern` can match a // zero-length string - return isZeroLengthPattern(pattern[patIdx:], separator) + return isZeroLengthPattern(pattern[patIdx:], separator, validate) } -func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) { +func isZeroLengthPattern(pattern string, separator rune, validate bool) (ret bool, err error) { // `/**`, `**/`, and `/**/` are special cases - a pattern such as `path/to/a/**` or `path/to/a/**/` // *should* match `path/to/a` because `a` might be a directory if pattern == "" || @@ -350,18 +350,18 @@ func isZeroLengthPattern(pattern string, separator rune) (ret bool, err error) { } commaIdx += patIdx - ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator) + ret, err = isZeroLengthPattern(pattern[patIdx:commaIdx]+pattern[closingIdx+1:], separator, validate) if ret || err != nil { return } patIdx = commaIdx + 1 } - return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator) + return isZeroLengthPattern(pattern[patIdx:closingIdx]+pattern[closingIdx+1:], separator, validate) } // no luck - validate the rest of the pattern - if !doValidatePattern(pattern, separator) { + if validate && !doValidatePattern(pattern, separator) { return false, ErrBadPattern } return false, nil diff --git a/vendor/modules.txt b/vendor/modules.txt index b961906c11..1398c1b28a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -507,7 +507,7 @@ github.com/bboreham/go-loser # github.com/beorn7/perks v1.0.1 ## explicit; go 1.11 github.com/beorn7/perks/quantile -# github.com/bmatcuk/doublestar/v4 v4.8.0 +# github.com/bmatcuk/doublestar/v4 v4.8.1 ## explicit; go 1.16 github.com/bmatcuk/doublestar/v4 # github.com/buger/jsonparser v1.1.1