Skip to content
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.

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

v1.14: avoid relying on golang.org/exp/slices.SortFunc #28473

Merged
merged 1 commit into from Oct 10, 2023

Conversation

rolinh
Copy link
Member

@rolinh rolinh commented Oct 9, 2023

The signature of slices.SortFunc has changed recently, breaking builds for projects that vendor Cilium 1.14 and a newer version of golang.org/x/exp with the signature change.

Due to the way dependencies work, it's unfortunately not always possible to downgrade golang.org/x/exp to a previous version.

The patch is based on the patch that has been applied to the main branch to allow upgrading golang.org/x/exp but without actually bumping the dependency.

ref: 036f1dc

The signature of `slices.SortFunc` has changed recently, breaking builds
for projects that vendor Cilium 1.14 and a newer version of
`golang.org/x/exp` with the signature change.

Due to the way dependencies work, it's unfortunately not always possible
to downgrade `golang.org/x/exp` to a previous version.

The patch is based on the patch that has been applied to the main branch
to allow upgrading `golang.org/x/exp` but without actually bumping the
dependency.

ref: 036f1dc

Signed-off-by: Robin Hahling <robin.hahling@gw-computing.net>
@rolinh rolinh added the kind/backports This PR provides functionality previously merged into master. label Oct 9, 2023
@rolinh rolinh requested a review from a team as a code owner October 9, 2023 14:44
@maintainer-s-little-helper maintainer-s-little-helper bot added the backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. label Oct 9, 2023
@qmonnet
Copy link
Member

qmonnet commented Oct 10, 2023

/test-backport-1.14

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Oct 10, 2023
@rolinh rolinh merged commit 099713d into v1.14 Oct 10, 2023
197 checks passed
@rolinh rolinh deleted the pr/rolinh/v1.14-slices-sortfunc branch October 10, 2023 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.14 This PR represents a backport for Cilium 1.14.x of a PR that was merged to main. kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants