fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #459 from fluxcd/libgit2-semver-flake

This commit is contained in:
Hidde Beydals 2021-10-22 13:43:40 +02:00 committed by GitHub
parent b35d7d88f2 9ff5334688
commit 7ff8da432e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/git/gogit/checkout.go
View File

@ -212,7 +212,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
} }
var matchedVersions semver.Collection var matchedVersions semver.Collection
for tag, _ := range tags { for tag := range tags {
v, err := version.ParseVersion(tag) v, err := version.ParseVersion(tag)
if err != nil { if err != nil {
continue continue
@ -239,7 +239,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
// versions into a chronological order. This is especially important for // versions into a chronological order. This is especially important for
// versions that differ only by build metadata, because it is not considered // versions that differ only by build metadata, because it is not considered
// a part of the comparable version in Semver // a part of the comparable version in Semver
return tagTimestamps[left.String()].Before(tagTimestamps[right.String()]) return tagTimestamps[left.Original()].Before(tagTimestamps[right.Original()])
}) })
v := matchedVersions[len(matchedVersions)-1] v := matchedVersions[len(matchedVersions)-1]
t := v.Original() t := v.Original()

2
pkg/git/libgit2/checkout.go
View File

@ -225,7 +225,7 @@ func (c *CheckoutSemVer) Checkout(ctx context.Context, path, url string, auth *g
// versions into a chronological order. This is especially important for // versions into a chronological order. This is especially important for
// versions that differ only by build metadata, because it is not considered // versions that differ only by build metadata, because it is not considered
// a part of the comparable version in Semver // a part of the comparable version in Semver
return tagTimestamps[left.String()].Before(tagTimestamps[right.String()]) return tagTimestamps[left.Original()].Before(tagTimestamps[right.Original()])
}) })
v := matchedVersions[len(matchedVersions)-1] v := matchedVersions[len(matchedVersions)-1]
t := v.Original() t := v.Original()

14
pkg/git/libgit2/checkout_test.go
View File

@ -229,13 +229,19 @@ func TestCheckoutTagSemVer_Checkout(t *testing.T) {
{ {
tag: "v0.1.0+build-1", tag: "v0.1.0+build-1",
annotated: true, annotated: true,
commitTime: now.Add(1 * time.Minute), commitTime: now.Add(10 * time.Minute),
tagTime: now.Add(1 * time.Hour), // This should be ignored during TS comparisons tagTime: now.Add(2 * time.Hour), // This should be ignored during TS comparisons
}, },
{ {
tag: "v0.1.0+build-2", tag: "v0.1.0+build-2",
annotated: false, annotated: false,
commitTime: now.Add(2 * time.Minute), commitTime: now.Add(30 * time.Minute),
},
{
tag: "v0.1.0+build-3",
annotated: true,
commitTime: now.Add(1 * time.Hour),
tagTime: now.Add(1 * time.Hour), // This should be ignored during TS comparisons
}, },
{ {
tag: "0.2.0", tag: "0.2.0",
@ -258,7 +264,7 @@ func TestCheckoutTagSemVer_Checkout(t *testing.T) {
{ {
name: "Orders by SemVer and timestamp", name: "Orders by SemVer and timestamp",
constraint: "<0.2.0", constraint: "<0.2.0",
expectTag: "v0.1.0+build-2", expectTag: "v0.1.0+build-3",
}, },
{ {
name: "Errors without match", name: "Errors without match",