Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/products.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ products:
fleet:
display: 'Fleet'
versioning: 'stack'
fleet-server:
display: 'Fleet Server'
versioning: 'stack'
heartbeat:
display: 'Heartbeat'
versioning: 'stack'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public ContentSourceMatch Match(ILoggerFactory logFactory, string repository, st
logger.LogInformation("Current is not using versioned branches checking product info");
var productVersion = versioningSystem.Current;
var previousMinorVersion = new SemVersion(productVersion.Major, Math.Max(productVersion.Minor - 1, 0), 0);
if (v >= productVersion)
if (v.Minor >= productVersion.Minor)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should normalize the product version to Major.Minor this might cause issues if one of the majors differ.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for jumping in on this!

{
logger.LogInformation("Speculative build {Branch} is gte product current '{ProductCurrent}'", branchOrTag, productVersion);
match = match with
Expand Down
Loading