Skip to content

[1.4] CI: fix modernize job failure #5074

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
rata merged 4 commits into from
Dec 20, 2025
Merged

[1.4] CI: fix modernize job failure #5074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adf0734
libc/int: use strings.Builder
kolyshkin Dec 15, 2025
701561e
ci: use latest Go for modernize job
kolyshkin Dec 15, 2025
a239670
ci: drop -test from modernize run
kolyshkin Dec 15, 2025
1b24932
ci: fix modernize URL
kolyshkin Dec 17, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
fetch-depth: 2
- uses: actions/setup-go@v6
with:
go-version: "${{ env.GO_VERSION }}"
go-version: stable # modernize@latest may require latest Go.
- name: install deps
run: |
sudo apt -q update
Expand All @@ -68,7 +68,7 @@ jobs:
git diff --exit-code
- name: run modernize
run: |
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
go run golang.org/x/tools/go/analysis/passes/modernize/cmd/modernize@latest -fix ./...
git diff --exit-code

compile-buildtags:
Expand Down
7 changes: 4 additions & 3 deletions libcontainer/integration/exec_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1067,15 +1067,16 @@ func TestHook(t *testing.T) {
ok(t, err)

// e.g: 'ls /prestart ...'
cmd := "ls "
var cmd strings.Builder
cmd.WriteString("ls ")
for _, hook := range hookFiles {
cmd += "/" + hook + " "
cmd.WriteString("/" + hook + " ")
}

var stdout bytes.Buffer
pconfig := libcontainer.Process{
Cwd: "/",
Args: []string{"sh", "-c", cmd},
Args: []string{"sh", "-c", cmd.String()},
Env: standardEnvironment,
Stdin: nil,
Stdout: &stdout,
Expand Down