Skip to content

eliminate skipping same-Y.maxZ, which should only replace #1749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2025
Merged

eliminate skipping same-Y.maxZ, which should only replace #1749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions alpha/template/semver/semver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,15 +323,15 @@ func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Chan

if curEdge != yProbe {
if zmaxQueue != "" {
// add skips edge to allow skipping over y iterations within an x stream
(*entries)[preChangeIndex].Skips = append((*entries)[preChangeIndex].Skips, zmaxQueue)
(*entries)[preChangeIndex].Replaces = zmaxQueue
}
zmaxQueue = (*entries)[preChangeIndex].Name
}
for curEdge < preChangeIndex {
// add skips edges to y-1 from z < y
(*entries)[preChangeIndex].Skips = append((*entries)[preChangeIndex].Skips, (*entries)[curEdge].Name)
if (*entries)[preChangeIndex].Replaces != (*entries)[curEdge].Name {
(*entries)[preChangeIndex].Skips = append((*entries)[preChangeIndex].Skips, (*entries)[curEdge].Name)
}
curEdge += 1
}
curEdge += 1
Expand Down
30 changes: 17 additions & 13 deletions alpha/template/semver/semver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/blang/semver/v4"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"

"github.com/operator-framework/operator-registry/alpha/declcfg"
Expand Down Expand Up @@ -157,8 +158,8 @@ func TestLinkChannels(t *testing.T) {
Package: "a",
Entries: []declcfg.ChannelEntry{
{Name: "a-v1.1.0", Replaces: ""},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0", Skips: []string{"a-v1.1.0"}},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1", Skips: []string{"a-v1.2.1"}},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0"},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1"},
},
},
{
Expand All @@ -169,7 +170,7 @@ func TestLinkChannels(t *testing.T) {
{Name: "a-v2.1.0", Replaces: ""},
{Name: "a-v2.1.1", Replaces: "", Skips: []string{"a-v2.1.0"}},
{Name: "a-v2.3.1", Replaces: ""},
{Name: "a-v2.3.2", Replaces: "a-v2.1.1", Skips: []string{"a-v2.1.1", "a-v2.3.1"}},
{Name: "a-v2.3.2", Replaces: "a-v2.1.1", Skips: []string{"a-v2.3.1"}},
},
},
},
Expand All @@ -195,8 +196,8 @@ func TestLinkChannels(t *testing.T) {
Package: "a",
Entries: []declcfg.ChannelEntry{
{Name: "a-v1.1.0", Replaces: ""},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0", Skips: []string{"a-v1.1.0"}},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1", Skips: []string{"a-v1.2.1"}},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0"},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1"},
},
},
{
Expand Down Expand Up @@ -229,8 +230,8 @@ func TestLinkChannels(t *testing.T) {
Package: "a",
Entries: []declcfg.ChannelEntry{
{Name: "a-v1.1.0", Replaces: ""},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0", Skips: []string{"a-v1.1.0"}},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1", Skips: []string{"a-v1.2.1"}},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0"},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1"},
},
},
{
Expand All @@ -240,7 +241,7 @@ func TestLinkChannels(t *testing.T) {
Entries: []declcfg.ChannelEntry{
{Name: "a-v2.1.0", Replaces: ""},
{Name: "a-v2.1.1", Replaces: "", Skips: []string{"a-v2.1.0"}},
{Name: "a-v2.3.1", Replaces: "a-v2.1.1", Skips: []string{"a-v2.1.1"}},
{Name: "a-v2.3.1", Replaces: "a-v2.1.1"},
},
},
},
Expand All @@ -250,7 +251,10 @@ func TestLinkChannels(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
sv := &semverTemplate{pkg: "a", GenerateMajorChannels: tt.generateMajorChannels, GenerateMinorChannels: tt.generateMinorChannels}
require.ElementsMatch(t, tt.out, sv.linkChannels(tt.unlinkedChannels, &channelOperatorVersions))
diff := cmp.Diff(tt.out, sv.linkChannels(tt.unlinkedChannels, &channelOperatorVersions))
if diff != "" {
t.Errorf("unexpected channel diff (-expected +received):\n%s", diff)
}
})
}
}
Expand Down Expand Up @@ -294,13 +298,13 @@ func TestGenerateChannels(t *testing.T) {
Package: "a",
Entries: []declcfg.ChannelEntry{
{Name: "a-v1.1.0", Replaces: ""},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0", Skips: []string{"a-v1.1.0"}},
{Name: "a-v1.2.1", Replaces: "a-v1.1.0"},
{Name: "a-v1.3.1-alpha", Replaces: ""},
{Name: "a-v1.3.1-beta", Replaces: ""},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1", Skips: []string{"a-v1.2.1", "a-v1.3.1-alpha", "a-v1.3.1-beta"}},
{Name: "a-v1.3.1", Replaces: "a-v1.2.1", Skips: []string{"a-v1.3.1-alpha", "a-v1.3.1-beta"}},
{Name: "a-v1.4.1-beta1", Replaces: ""},
{Name: "a-v1.4.1-beta2", Replaces: ""},
{Name: "a-v1.4.1", Replaces: "a-v1.3.1", Skips: []string{"a-v1.3.1", "a-v1.4.1-beta1", "a-v1.4.1-beta2"}},
{Name: "a-v1.4.1", Replaces: "a-v1.3.1", Skips: []string{"a-v1.4.1-beta1", "a-v1.4.1-beta2"}},
},
},
{
Expand All @@ -311,7 +315,7 @@ func TestGenerateChannels(t *testing.T) {
{Name: "a-v2.1.0", Replaces: ""},
{Name: "a-v2.1.1", Replaces: "", Skips: []string{"a-v2.1.0"}},
{Name: "a-v2.3.1", Replaces: ""},
{Name: "a-v2.3.2", Replaces: "a-v2.1.1", Skips: []string{"a-v2.1.1", "a-v2.3.1"}},
{Name: "a-v2.3.2", Replaces: "a-v2.1.1", Skips: []string{"a-v2.3.1"}},
},
},
{
Expand Down
Loading