[1.4] assorted small backports#5110
Merged
AkihiroSuda merged 9 commits intoopencontainers:release-1.4from Feb 11, 2026
Merged
Conversation
Commit b2f8a74 "clothed" the naked return as inflicted by gofumpt v0.9.0. Since gofumpt v0.9.2 this rule was moved to "extra" category, not enabled by default. The only other "extra" rule is to group adjacent parameters with the same type, which also makes sense. Enable gofumpt "extra" rules, and reformat the code accordingly. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 67840cc) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Contributor
Author
|
close/reopen to fix CI |
Bumps [golang.org/x/sys](https://github.com/golang/sys) from 0.37.0 to 0.38.0. - [Commits](golang/sys@v0.37.0...v0.38.0) --- updated-dependencies: - dependency-name: golang.org/x/sys dependency-version: 0.38.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit 071beab) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This is mostly a mechanical change, but we also need to change some types to match the "mode int" argument that golang.org/x/sys/unix decided to use. Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (cherry picked from commit a0e809a) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Alas, these new constants are already in v1.4.0 release so we can't remove those right away, but we can mark them as deprecated now and target removal for v1.5.0. So, - mark them as deprecated; - redefine via unix.MPOL_* counterparts; - fix the validator code to use unix.MPOL_* directly. This amends commit a0e809a. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 3741f91) 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>
26eebd8 to
5baeb39
Compare
Contributor
Author
lifubang
approved these changes
Feb 11, 2026
AkihiroSuda
approved these changes
Feb 11, 2026
Member
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is a backport of the following small PRs from the main branch:
To ease the future backporting:
To deprecate the "leaked" IDs we shouldn't have exported:
To ensure we build with a supported Docker version:
The last one also fixes a CI failure (a check added in #5000).