Use same semver lib that is use elsewhere in go-ipfs
gammazero committed
Mar 26, 2021 at 01:47 UTC
2fc1594f51a606d2f1e1b4b735fa5c8098153c4f
4 files changed
+11
-9
go.mod
+2
-2
@@ -4,10 +4,10 @@ require (
4
bazil.org/fuse v0.0.0-20200117225306-7b5117fecadc
5
contrib.go.opencensus.io/exporter/prometheus v0.2.0
6
github.com/blang/semver v3.5.1+incompatible
7
+ github.com/blang/semver/v4 v4.0.0
8
github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d
9
github.com/cheggaaa/pb v1.0.29
9
- github.com/coreos/go-semver v0.3.0
10
- github.com/coreos/go-systemd/v22 v22.1.0
10
+ github.com/coreos/go-systemd/v22 v22.3.0
11
github.com/dustin/go-humanize v1.0.0
12
github.com/elgris/jsondiff v0.0.0-20160530203242-765b5c24c302
13
github.com/fsnotify/fsnotify v1.4.9
go.sum
+4
-2
@@ -59,6 +59,8 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
59
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
60
github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
61
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
62
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
63
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
64
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
65
github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d h1:QgeLLoPD3kRVmeu/1al9iIpIANMi9O1zXFm8BnYGCJg=
66
github.com/bren2010/proquint v0.0.0-20160323162903-38337c27106d/go.mod h1:Jbj8eKecMNwf0KFI75skSUZqMB4UCRcndUScVBTWyUI=
@@ -103,8 +105,8 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
105
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI=
106
github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
107
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
106
-github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg=
107
-github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
108
+github.com/coreos/go-systemd/v22 v22.3.0 h1:C8u/Ljj8G8O6rqWJh2J8cDyeEFBMWvXlvJ/ccMyzcqw=
109
+github.com/coreos/go-systemd/v22 v22.3.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
110
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
111
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
112
github.com/crackcomm/go-gitignore v0.0.0-20170627025303-887ab5e44cc3 h1:HVTnpeuvF6Owjd5mniCL8DEXo7uYXdQEmOP4FJbV5tg=
repo/fsrepo/migrations/versions.go
+3
-3
@@ -9,7 +9,7 @@ import (
9
"sort"
10
"strings"
11
12
- "github.com/coreos/go-semver/semver"
12
+ "github.com/blang/semver/v4"
13
)
14
15
const distVersions = "versions"
@@ -46,11 +46,11 @@ func DistVersions(ctx context.Context, fetcher Fetcher, dist string, sortDesc bo
46
defer rc.Close()
47
48
prefix := "v"
49
- var vers []*semver.Version
49
+ var vers []semver.Version
50
51
scan := bufio.NewScanner(rc)
52
for scan.Scan() {
53
- ver, err := semver.NewVersion(strings.TrimLeft(scan.Text(), prefix))
53
+ ver, err := semver.Make(strings.TrimLeft(scan.Text(), prefix))
54
if err != nil {
55
continue
56
}
repo/fsrepo/migrations/versions_test.go
+2
-2
@@ -4,7 +4,7 @@ import (
4
"context"
5
"testing"
6
7
- "github.com/coreos/go-semver/semver"
7
+ "github.com/blang/semver/v4"
8
)
9
10
const testDist = "go-ipfs"
@@ -43,7 +43,7 @@ func TestLatestDistVersion(t *testing.T) {
43
if len(latest) < 6 {
44
t.Fatal("latest version string too short", latest)
45
}
46
- _, err = semver.NewVersion(latest[1:])
46
+ _, err = semver.New(latest[1:])
47
if err != nil {
48
t.Fatal("latest version has invalid format:", latest)
49
}