Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 843f6f2

Browse files
sdboyersdboyer
authored
Merge pull request #938 from carolynvs/use-semver-PR
Use fork of Masterminds/semver until PR is merged
2 parents b8ecfaa + 0cbbebd commit 843f6f2

File tree

6 files changed

+26
-8
lines changed

6 files changed

+26
-8
lines changed

‎Gopkg.lock

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[[constraint]]
2-
branch = "2.x"
2+
branch = "parse-constraints-with-dash-in-pre"
33
name = "github.com/Masterminds/semver"
4+
source = "https://github.com/carolynvs/semver.git"
45

56
[[constraint]]
67
name = "github.com/Masterminds/vcs"

‎cmd/dep/godep_importer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ func TestGodepConfig_ConvertProject_WithSemverSuffix(t *testing.T) {
192192
}
193193

194194
v := d.Constraint.String()
195-
if v != ">=1.12.0, <=12.0.0-g2fd980e" {
196-
t.Fatalf("Expected manifest constraint to be >=1.12.0, <=12.0.0-g2fd980e, got %s", v)
195+
if v != "^1.12.0-12-g2fd980e" {
196+
t.Fatalf("Expected manifest constraint to be ^1.12.0-12-g2fd980e, got %s", v)
197197
}
198198

199199
p := lock.P[0]

‎vendor/github.com/Masterminds/semver/constraints.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/semver/constraints_test.go

Lines changed: 14 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/Masterminds/semver/parse.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)