From 158d49ab48d1e6e93b31e4d5150a3ae8bd211077 Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Mon, 25 Aug 2025 10:47:59 +0200 Subject: [PATCH] Add sort to linkChannels output before diff check Signed-off-by: Per Goncalves da Silva --- alpha/template/semver/semver.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/alpha/template/semver/semver.go b/alpha/template/semver/semver.go index b98658f2f..77b713737 100644 --- a/alpha/template/semver/semver.go +++ b/alpha/template/semver/semver.go @@ -1,9 +1,11 @@ package semver import ( + "cmp" "context" "fmt" "io" + "slices" "sort" "github.com/blang/semver/v4" @@ -283,8 +285,6 @@ func (sv *semverTemplate) generateChannels(semverChannels *bundleVersions) []dec } func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Channel, harvestedVersions *bundleVersions) []declcfg.Channel { - channels := []declcfg.Channel{} - // bundle --> version lookup bundleVersions := make(map[string]semver.Version) for _, vs := range *harvestedVersions { @@ -295,6 +295,7 @@ func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Chan } } + channels := make([]declcfg.Channel, 0, len(unlinkedChannels)) for _, channel := range unlinkedChannels { entries := &channel.Entries sort.Slice(*entries, func(i, j int) bool { @@ -350,6 +351,10 @@ func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Chan channels = append(channels, *channel) } + slices.SortFunc(channels, func(a, b declcfg.Channel) int { + return cmp.Compare(a.Name, b.Name) + }) + return channels }