Skip to content

[1.4] CI: fix modernize job failure#5074

Merged
rata merged 4 commits intoopencontainers:release-1.4from
kolyshkin:1.4-5072
Dec 20, 2025
Merged

[1.4] CI: fix modernize job failure#5074
rata merged 4 commits intoopencontainers:release-1.4from
kolyshkin:1.4-5072

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Dec 17, 2025

This is a

to release-1.4 branch.

The alternative to this is to drop modernize job (it does not make much sense for a release branch).


  1. libc/int: use strings.Builder

    Generated by modernize@latest (v0.21.0).

  2. ci: use latest Go for modernize job

    Since we use modernize@latest, it may require latest Go as well (and now it does),
    so use "go-version: stable" explicitly (which resolves to latest Go).

    This fixes the issue with CI:

    go: golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest: golang.org/x/tools/gopls@v0.21.0 requires go >= 1.25 (running go 1.24.11; GOTOOLCHAIN=local)

  3. ci: drop -test from modernize run

    The modernize documentation used to suggest -test flag but it's not
    needed as it is enabled by default. Drop it.

  4. ci: fix modernize url

    See https://go.dev/cl/706918, https://go.dev/cl/730820.

Generated by modernize@latest (v0.21.0).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 6522697)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Since we use modernize@latest, it may require latest Go as well (and now it does),
so use "go-version: stable" explicitly (which resolves to latest Go).

This fixes the issue with CI:

> go: golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest: golang.org/x/tools/gopls@v0.21.0 requires go >= 1.25 (running go 1.24.11; GOTOOLCHAIN=local)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 16ee2bb)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
The modernize documentation used to suggest -test flag but it's not
needed as it is enabled by default. Drop it.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit dbc4234)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added area/ci backport/1.4-pr A backport PR to release-1.4 labels Dec 17, 2025
@kolyshkin kolyshkin marked this pull request as draft December 17, 2025 20:13
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 428043b)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin mentioned this pull request Dec 17, 2025
@kolyshkin kolyshkin marked this pull request as ready for review December 17, 2025 20:43
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 enabled auto-merge December 19, 2025 15:31
@rata rata merged commit f5a008c into opencontainers:release-1.4 Dec 20, 2025
37 checks passed
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Mar 12, 2026
Note a few minor PRs were not mentioned: opencontainers#5134, opencontainers#5094, opencontainers#5074.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants