github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-08-12 11:52:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2462 from containers/renovate/github.com-masterminds-semver-v3-3.x

Browse Source 
fix(deps): update module github.com/masterminds/semver/v3 to v3.3.1
This commit is contained in:
Miloslav Trmač 2024-11-20 15:50:53 +01:00 committed by GitHub
commit c5eaf49918
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -6,7 +6,7 @@ go 1.22.6
// Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates // Warning: Ensure the "go" and "toolchain" versions match exactly to prevent unwanted auto-updates
require ( require (
github.com/Masterminds/semver/v3 v3.3.0 github.com/Masterminds/semver/v3 v3.3.1
github.com/containers/common v0.61.0 github.com/containers/common v0.61.0
github.com/containers/image/v5 v5.33.0 github.com/containers/image/v5 v5.33.0
github.com/containers/ocicrypt v1.2.0 github.com/containers/ocicrypt v1.2.0

4
go.sum
View File

@ -8,8 +8,8 @@ github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg6
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg= github.com/Microsoft/hcsshim v0.12.9 h1:2zJy5KA+l0loz1HzEGqyNnjd3fyZA31ZBCGKacp6lLg=

24
vendor/github.com/Masterminds/semver/v3/version.go generated vendored
View File

@ -39,9 +39,11 @@ var (
) )
// semVerRegex is the regular expression used to parse a semantic version. // semVerRegex is the regular expression used to parse a semantic version.
const semVerRegex string = `v?([0-9]+)(\.[0-9]+)?(\.[0-9]+)?` + // This is not the official regex from the semver spec. It has been modified to allow for loose handling
`(-([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` + // where versions like 2.1 are detected.
`(\+([0-9A-Za-z\-]+(\.[0-9A-Za-z\-]+)*))?` const semVerRegex string = `v?(0|[1-9]\d*)(?:\.(0|[1-9]\d*))?(?:\.(0|[1-9]\d*))?` +
`(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?` +
`(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?`
// Version represents a single semantic version. // Version represents a single semantic version.
type Version struct { type Version struct {
@ -146,8 +148,8 @@ func NewVersion(v string) (*Version, error) {
} }
sv := &Version{ sv := &Version{
metadata: m[8], metadata: m[5],
pre: m[5], pre: m[4],
original: v, original: v,
} }
@ -158,7 +160,7 @@ func NewVersion(v string) (*Version, error) {
} }
if m[2] != "" { if m[2] != "" {
sv.minor, err = strconv.ParseUint(strings.TrimPrefix(m[2], "."), 10, 64) sv.minor, err = strconv.ParseUint(m[2], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error parsing version segment: %s", err) return nil, fmt.Errorf("Error parsing version segment: %s", err)
} }
@ -167,7 +169,7 @@ func NewVersion(v string) (*Version, error) {
} }
if m[3] != "" { if m[3] != "" {
sv.patch, err = strconv.ParseUint(strings.TrimPrefix(m[3], "."), 10, 64) sv.patch, err = strconv.ParseUint(m[3], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("Error parsing version segment: %s", err) return nil, fmt.Errorf("Error parsing version segment: %s", err)
} }
@ -612,7 +614,9 @@ func containsOnly(s string, comp string) bool {
func validatePrerelease(p string) error { func validatePrerelease(p string) error {
eparts := strings.Split(p, ".") eparts := strings.Split(p, ".")
for _, p := range eparts { for _, p := range eparts {
if containsOnly(p, num) { if p == "" {
return ErrInvalidMetadata
} else if containsOnly(p, num) {
if len(p) > 1 && p[0] == '0' { if len(p) > 1 && p[0] == '0' {
return ErrSegmentStartsZero return ErrSegmentStartsZero
} }
@ -631,7 +635,9 @@ func validatePrerelease(p string) error {
func validateMetadata(m string) error { func validateMetadata(m string) error {
eparts := strings.Split(m, ".") eparts := strings.Split(m, ".")
for _, p := range eparts { for _, p := range eparts {
if !containsOnly(p, allowed) { if p == "" {
return ErrInvalidMetadata
} else if !containsOnly(p, allowed) {
return ErrInvalidMetadata return ErrInvalidMetadata
} }
} }

2
vendor/modules.txt vendored
View File

@ -5,7 +5,7 @@ dario.cat/mergo
## explicit; go 1.18 ## explicit; go 1.18
github.com/BurntSushi/toml github.com/BurntSushi/toml
github.com/BurntSushi/toml/internal github.com/BurntSushi/toml/internal
# github.com/Masterminds/semver/v3 v3.3.0 # github.com/Masterminds/semver/v3 v3.3.1
## explicit; go 1.21 ## explicit; go 1.21
github.com/Masterminds/semver/v3 github.com/Masterminds/semver/v3
# github.com/Microsoft/go-winio v0.6.2 # github.com/Microsoft/go-winio v0.6.2