Skip to content

[1.3] misc backports + Go 1.24->1.25#5111

Merged
rata merged 7 commits intoopencontainers:release-1.3from
kolyshkin:1.3-backports
Feb 11, 2026
Merged

[1.3] misc backports + Go 1.24->1.25#5111
rata merged 7 commits intoopencontainers:release-1.3from
kolyshkin:1.3-backports

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Feb 10, 2026

This is a backport of the following small PRs from the main branch:

The last one also fixes a CI failure (a check added in #4999).

Also, add Go 1.25 to test matrix, and remove Go 1.24 as it is no longer supported (we still keep Go 1.23).

Bump bats to the version from Fedora 42 (used in "fedora" job), so we
have the same version everywhere.

This also fixes an issue introduced by commit d31e6b8 (which forgot to
bump bats in GHA CI), and adds a note to the yaml in order to avoid the
same issue in the future.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 6af1d63)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 2a7ce15)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This which is already using in CI on Fedora.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f128234)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This version was released almost a year ago.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit f4710e5)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(as well as for testing on Cirrus CI)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 79b97d4)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 68771cf)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added area/ci backport/1.3-pr A backport PR to release-1.3 labels Feb 10, 2026
@kolyshkin kolyshkin marked this pull request as draft February 10, 2026 22:28
Go 1.24 is no longer supported, and Go 1.25 (which we use in Dockerfile
for official binaries) is not being tested against.

So remove Go 1.24.x and add Go 1.25.x.

We keep Go 1.23.x is this is a minimally required version for this
branch.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin changed the title [1.3] misc backports [1.3] misc backports + Go 1.24->1.25 Feb 10, 2026
@kolyshkin kolyshkin marked this pull request as ready for review February 10, 2026 22:44
@kolyshkin kolyshkin added this to the 1.3.5 milestone Feb 11, 2026
Copy link
Copy Markdown
Member

@rata rata left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@rata rata merged commit e669727 into opencontainers:release-1.3 Feb 11, 2026
37 checks passed
@kolyshkin kolyshkin mentioned this pull request Mar 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ci backport/1.3-pr A backport PR to release-1.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants