From e943fb61ef112d2ab00c795eb03a28903fce12f7 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 5 Sep 2020 23:17:07 +0200 Subject: [PATCH 1/6] switch to patched fork --- go.mod | 2 +- go.sum | 4 ++-- modules/git/git.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 7f6c3f0c8463d..35d18dd8009cf 100644 --- a/go.mod +++ b/go.mod @@ -16,6 +16,7 @@ require ( gitea.com/macaron/macaron v1.5.0 gitea.com/macaron/session v0.0.0-20200902202411-e3a87877db6e gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 + github.com/6543/go-version v1.2.3 github.com/BurntSushi/toml v0.3.1 github.com/PuerkitoBio/goquery v1.5.1 github.com/RoaringBitmap/roaring v0.4.23 // indirect @@ -51,7 +52,6 @@ require ( github.com/google/uuid v1.1.1 github.com/gorilla/context v1.1.1 github.com/hashicorp/go-retryablehttp v0.6.6 // indirect - github.com/hashicorp/go-version v1.2.1 github.com/huandu/xstrings v1.3.0 github.com/issue9/assert v1.3.2 // indirect github.com/issue9/identicon v1.0.1 diff --git a/go.sum b/go.sum index 4b48d4379a20c..2b11989e698b3 100644 --- a/go.sum +++ b/go.sum @@ -48,6 +48,8 @@ gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 h1:N9QFoeNsUXLhl14m gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7/go.mod h1:kgsbFPPS4P+acDYDOPDa3N4IWWOuDJt5/INKRUz7aks= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= +github.com/6543/go-version v1.2.3 h1:uF30BawMhoQLzqBeCwhFcWM6HVxlzMHe/zXbzJeKP+o= +github.com/6543/go-version v1.2.3/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -482,8 +484,6 @@ github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerX github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= diff --git a/modules/git/git.go b/modules/git/git.go index a9ff923cc5bea..dbbe115e604b1 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -15,7 +15,7 @@ import ( "code.gitea.io/gitea/modules/process" - "github.com/hashicorp/go-version" + "github.com/6543/go-version" ) var ( From 4f7a59df869b3f0e8cfdb29a7b517415f6d9abc2 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sat, 5 Sep 2020 23:17:17 +0200 Subject: [PATCH 2/6] vendor --- vendor/github.com/{hashicorp => 6543}/go-version/LICENSE | 0 vendor/github.com/{hashicorp => 6543}/go-version/README.md | 0 .../github.com/{hashicorp => 6543}/go-version/constraint.go | 0 vendor/github.com/6543/go-version/go.mod | 1 + vendor/github.com/{hashicorp => 6543}/go-version/version.go | 3 ++- .../{hashicorp => 6543}/go-version/version_collection.go | 0 vendor/github.com/hashicorp/go-version/go.mod | 1 - vendor/modules.txt | 6 +++--- 8 files changed, 6 insertions(+), 5 deletions(-) rename vendor/github.com/{hashicorp => 6543}/go-version/LICENSE (100%) rename vendor/github.com/{hashicorp => 6543}/go-version/README.md (100%) rename vendor/github.com/{hashicorp => 6543}/go-version/constraint.go (100%) create mode 100644 vendor/github.com/6543/go-version/go.mod rename vendor/github.com/{hashicorp => 6543}/go-version/version.go (99%) rename vendor/github.com/{hashicorp => 6543}/go-version/version_collection.go (100%) delete mode 100644 vendor/github.com/hashicorp/go-version/go.mod diff --git a/vendor/github.com/hashicorp/go-version/LICENSE b/vendor/github.com/6543/go-version/LICENSE similarity index 100% rename from vendor/github.com/hashicorp/go-version/LICENSE rename to vendor/github.com/6543/go-version/LICENSE diff --git a/vendor/github.com/hashicorp/go-version/README.md b/vendor/github.com/6543/go-version/README.md similarity index 100% rename from vendor/github.com/hashicorp/go-version/README.md rename to vendor/github.com/6543/go-version/README.md diff --git a/vendor/github.com/hashicorp/go-version/constraint.go b/vendor/github.com/6543/go-version/constraint.go similarity index 100% rename from vendor/github.com/hashicorp/go-version/constraint.go rename to vendor/github.com/6543/go-version/constraint.go diff --git a/vendor/github.com/6543/go-version/go.mod b/vendor/github.com/6543/go-version/go.mod new file mode 100644 index 0000000000000..f52ad8ac529ab --- /dev/null +++ b/vendor/github.com/6543/go-version/go.mod @@ -0,0 +1 @@ +module github.com/6543/go-version diff --git a/vendor/github.com/hashicorp/go-version/version.go b/vendor/github.com/6543/go-version/version.go similarity index 99% rename from vendor/github.com/hashicorp/go-version/version.go rename to vendor/github.com/6543/go-version/version.go index 09703e8e6ff03..1d96a6f71bb3e 100644 --- a/vendor/github.com/hashicorp/go-version/version.go +++ b/vendor/github.com/6543/go-version/version.go @@ -18,9 +18,10 @@ var ( // The raw regular expression string used for testing the validity // of a version. const ( - VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` + + VersionRegexpRaw string = `[vV]?([0-9]+(\.[0-9]+)*?)` + `(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` + `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` + + `([\+\.\-~]g[0-9A-Fa-f]{10}$)?` + `?` // SemverRegexpRaw requires a separator between version and prerelease diff --git a/vendor/github.com/hashicorp/go-version/version_collection.go b/vendor/github.com/6543/go-version/version_collection.go similarity index 100% rename from vendor/github.com/hashicorp/go-version/version_collection.go rename to vendor/github.com/6543/go-version/version_collection.go diff --git a/vendor/github.com/hashicorp/go-version/go.mod b/vendor/github.com/hashicorp/go-version/go.mod deleted file mode 100644 index f5285555fa847..0000000000000 --- a/vendor/github.com/hashicorp/go-version/go.mod +++ /dev/null @@ -1 +0,0 @@ -module github.com/hashicorp/go-version diff --git a/vendor/modules.txt b/vendor/modules.txt index 656eaf44031bb..13079de8b8383 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -48,6 +48,9 @@ gitea.com/macaron/session/redis # gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 ## explicit gitea.com/macaron/toolbox +# github.com/6543/go-version v1.2.3 +## explicit +github.com/6543/go-version # github.com/BurntSushi/toml v0.3.1 ## explicit github.com/BurntSushi/toml @@ -423,9 +426,6 @@ github.com/hashicorp/go-cleanhttp # github.com/hashicorp/go-retryablehttp v0.6.6 ## explicit github.com/hashicorp/go-retryablehttp -# github.com/hashicorp/go-version v1.2.1 -## explicit -github.com/hashicorp/go-version # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl github.com/hashicorp/hcl/hcl/ast From a69a0fe5156928f9b879d2c2ca0ee5f7727ba0fb Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 5 Sep 2020 19:51:53 -0400 Subject: [PATCH 3/6] reference upstream lib and use replace in go.mod --- go.mod | 2 ++ modules/git/git.go | 2 +- vendor/modules.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 35d18dd8009cf..b5fc121b02dd0 100644 --- a/go.mod +++ b/go.mod @@ -117,3 +117,5 @@ require ( xorm.io/builder v0.3.7 xorm.io/xorm v1.0.4 ) + +replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.2 diff --git a/modules/git/git.go b/modules/git/git.go index dbbe115e604b1..a9ff923cc5bea 100644 --- a/modules/git/git.go +++ b/modules/git/git.go @@ -15,7 +15,7 @@ import ( "code.gitea.io/gitea/modules/process" - "github.com/6543/go-version" + "github.com/hashicorp/go-version" ) var ( diff --git a/vendor/modules.txt b/vendor/modules.txt index 13079de8b8383..a0dc2a3afdd7e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -965,3 +965,4 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags +# github.com/hashicorp/go-version => github.com/6543/go-version v1.2.2 From 243e5134167f782539f10bbe191d59c34661b4c1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 5 Sep 2020 19:52:47 -0400 Subject: [PATCH 4/6] reference upstream lib and use replace in go.mod --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/{6543 => hashicorp}/go-version/LICENSE | 0 vendor/github.com/{6543 => hashicorp}/go-version/README.md | 0 .../github.com/{6543 => hashicorp}/go-version/constraint.go | 0 vendor/github.com/{6543 => hashicorp}/go-version/go.mod | 0 vendor/github.com/{6543 => hashicorp}/go-version/version.go | 3 +-- .../{6543 => hashicorp}/go-version/version_collection.go | 0 vendor/modules.txt | 6 +++--- 9 files changed, 7 insertions(+), 8 deletions(-) rename vendor/github.com/{6543 => hashicorp}/go-version/LICENSE (100%) rename vendor/github.com/{6543 => hashicorp}/go-version/README.md (100%) rename vendor/github.com/{6543 => hashicorp}/go-version/constraint.go (100%) rename vendor/github.com/{6543 => hashicorp}/go-version/go.mod (100%) rename vendor/github.com/{6543 => hashicorp}/go-version/version.go (99%) rename vendor/github.com/{6543 => hashicorp}/go-version/version_collection.go (100%) diff --git a/go.mod b/go.mod index b5fc121b02dd0..50917c867b066 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,6 @@ require ( gitea.com/macaron/macaron v1.5.0 gitea.com/macaron/session v0.0.0-20200902202411-e3a87877db6e gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 - github.com/6543/go-version v1.2.3 github.com/BurntSushi/toml v0.3.1 github.com/PuerkitoBio/goquery v1.5.1 github.com/RoaringBitmap/roaring v0.4.23 // indirect @@ -52,6 +51,7 @@ require ( github.com/google/uuid v1.1.1 github.com/gorilla/context v1.1.1 github.com/hashicorp/go-retryablehttp v0.6.6 // indirect + github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 github.com/huandu/xstrings v1.3.0 github.com/issue9/assert v1.3.2 // indirect github.com/issue9/identicon v1.0.1 diff --git a/go.sum b/go.sum index 2b11989e698b3..0a6fd123d5fca 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 h1:N9QFoeNsUXLhl14m gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7/go.mod h1:kgsbFPPS4P+acDYDOPDa3N4IWWOuDJt5/INKRUz7aks= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= -github.com/6543/go-version v1.2.3 h1:uF30BawMhoQLzqBeCwhFcWM6HVxlzMHe/zXbzJeKP+o= -github.com/6543/go-version v1.2.3/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= +github.com/6543/go-version v1.2.2 h1:AiqWspE9EdG/BT7ZOVCu16CC9FCyrvTaBS/FLL8TC80= +github.com/6543/go-version v1.2.2/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/vendor/github.com/6543/go-version/LICENSE b/vendor/github.com/hashicorp/go-version/LICENSE similarity index 100% rename from vendor/github.com/6543/go-version/LICENSE rename to vendor/github.com/hashicorp/go-version/LICENSE diff --git a/vendor/github.com/6543/go-version/README.md b/vendor/github.com/hashicorp/go-version/README.md similarity index 100% rename from vendor/github.com/6543/go-version/README.md rename to vendor/github.com/hashicorp/go-version/README.md diff --git a/vendor/github.com/6543/go-version/constraint.go b/vendor/github.com/hashicorp/go-version/constraint.go similarity index 100% rename from vendor/github.com/6543/go-version/constraint.go rename to vendor/github.com/hashicorp/go-version/constraint.go diff --git a/vendor/github.com/6543/go-version/go.mod b/vendor/github.com/hashicorp/go-version/go.mod similarity index 100% rename from vendor/github.com/6543/go-version/go.mod rename to vendor/github.com/hashicorp/go-version/go.mod diff --git a/vendor/github.com/6543/go-version/version.go b/vendor/github.com/hashicorp/go-version/version.go similarity index 99% rename from vendor/github.com/6543/go-version/version.go rename to vendor/github.com/hashicorp/go-version/version.go index 1d96a6f71bb3e..09703e8e6ff03 100644 --- a/vendor/github.com/6543/go-version/version.go +++ b/vendor/github.com/hashicorp/go-version/version.go @@ -18,10 +18,9 @@ var ( // The raw regular expression string used for testing the validity // of a version. const ( - VersionRegexpRaw string = `[vV]?([0-9]+(\.[0-9]+)*?)` + + VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` + `(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` + `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` + - `([\+\.\-~]g[0-9A-Fa-f]{10}$)?` + `?` // SemverRegexpRaw requires a separator between version and prerelease diff --git a/vendor/github.com/6543/go-version/version_collection.go b/vendor/github.com/hashicorp/go-version/version_collection.go similarity index 100% rename from vendor/github.com/6543/go-version/version_collection.go rename to vendor/github.com/hashicorp/go-version/version_collection.go diff --git a/vendor/modules.txt b/vendor/modules.txt index a0dc2a3afdd7e..46ab02b316165 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -48,9 +48,6 @@ gitea.com/macaron/session/redis # gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 ## explicit gitea.com/macaron/toolbox -# github.com/6543/go-version v1.2.3 -## explicit -github.com/6543/go-version # github.com/BurntSushi/toml v0.3.1 ## explicit github.com/BurntSushi/toml @@ -426,6 +423,9 @@ github.com/hashicorp/go-cleanhttp # github.com/hashicorp/go-retryablehttp v0.6.6 ## explicit github.com/hashicorp/go-retryablehttp +# github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 => github.com/6543/go-version v1.2.2 +## explicit +github.com/hashicorp/go-version # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl github.com/hashicorp/hcl/hcl/ast From b36e78110b72fb3ca000a1a31add3622ef2b1d20 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 6 Sep 2020 02:13:12 +0200 Subject: [PATCH 5/6] Apply suggestions from code review --- go.mod | 2 +- vendor/modules.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 50917c867b066..07a8f8c20089a 100644 --- a/go.mod +++ b/go.mod @@ -118,4 +118,4 @@ require ( xorm.io/xorm v1.0.4 ) -replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.2 +replace github.com/hashicorp/go-version => github.com/6543/go-version v1.2.3 diff --git a/vendor/modules.txt b/vendor/modules.txt index 46ab02b316165..69423a6975841 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -423,7 +423,7 @@ github.com/hashicorp/go-cleanhttp # github.com/hashicorp/go-retryablehttp v0.6.6 ## explicit github.com/hashicorp/go-retryablehttp -# github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 => github.com/6543/go-version v1.2.2 +# github.com/hashicorp/go-version v0.0.0-00010101000000-000000000000 => github.com/6543/go-version v1.2.3 ## explicit github.com/hashicorp/go-version # github.com/hashicorp/hcl v1.0.0 @@ -965,4 +965,4 @@ xorm.io/xorm/log xorm.io/xorm/names xorm.io/xorm/schemas xorm.io/xorm/tags -# github.com/hashicorp/go-version => github.com/6543/go-version v1.2.2 +# github.com/hashicorp/go-version => github.com/6543/go-version v1.2.3 From 1bead7b1d762ca3562ba6b6be372a4dd6e2f8b16 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Sun, 6 Sep 2020 02:13:46 +0200 Subject: [PATCH 6/6] vendor --- go.sum | 4 ++-- vendor/github.com/hashicorp/go-version/version.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.sum b/go.sum index 0a6fd123d5fca..2b11989e698b3 100644 --- a/go.sum +++ b/go.sum @@ -48,8 +48,8 @@ gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7 h1:N9QFoeNsUXLhl14m gitea.com/macaron/toolbox v0.0.0-20190822013122-05ff0fc766b7/go.mod h1:kgsbFPPS4P+acDYDOPDa3N4IWWOuDJt5/INKRUz7aks= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= -github.com/6543/go-version v1.2.2 h1:AiqWspE9EdG/BT7ZOVCu16CC9FCyrvTaBS/FLL8TC80= -github.com/6543/go-version v1.2.2/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= +github.com/6543/go-version v1.2.3 h1:uF30BawMhoQLzqBeCwhFcWM6HVxlzMHe/zXbzJeKP+o= +github.com/6543/go-version v1.2.3/go.mod h1:fcfWh4zkneEgGXe8JJptiGwp8l6JgJJgS7oTw6P83So= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= diff --git a/vendor/github.com/hashicorp/go-version/version.go b/vendor/github.com/hashicorp/go-version/version.go index 09703e8e6ff03..1d96a6f71bb3e 100644 --- a/vendor/github.com/hashicorp/go-version/version.go +++ b/vendor/github.com/hashicorp/go-version/version.go @@ -18,9 +18,10 @@ var ( // The raw regular expression string used for testing the validity // of a version. const ( - VersionRegexpRaw string = `v?([0-9]+(\.[0-9]+)*?)` + + VersionRegexpRaw string = `[vV]?([0-9]+(\.[0-9]+)*?)` + `(-([0-9]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)|(-?([A-Za-z\-~]+[0-9A-Za-z\-~]*(\.[0-9A-Za-z\-~]+)*)))?` + `(\+([0-9A-Za-z\-~]+(\.[0-9A-Za-z\-~]+)*))?` + + `([\+\.\-~]g[0-9A-Fa-f]{10}$)?` + `?` // SemverRegexpRaw requires a separator between version and prerelease