Skip to content

[pull] main from containerd:main #276

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
pull merged 2 commits into from
Mar 23, 2026
+4 −4
Merged

[pull] main from containerd:main #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27f0b12
fix linter issues
SergeyKanzhelev Mar 22, 2026
1a47772
Merge pull request #13089 from SergeyKanzhelev/linterIssues
dmcgowan Mar 23, 2026
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
2 changes: 1 addition & 1 deletion core/snapshots/storage/bolt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ func CommitActive(ctx context.Context, key, name string, usage snapshots.Usage,

// Updates parent back link to use new key
if err := pbkt.Put(parentKey(pid, id), []byte(name)); err != nil {
return fmt.Errorf("failed to update parent link %q from %q to %q: %w", pid, key, name, err)
return fmt.Errorf("failed to update parent link %v from %q to %q: %w", pid, key, name, err)
}
}

Expand Down
4 changes: 2 additions & 2 deletions plugins/transfer/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func init() {
applier = inst.(diff.Applier)
} else {
var applierID string
for name, plugin := range ic.GetAll() {
for _, plugin := range ic.GetAll() {
if plugin.Registration.Type != plugins.DiffPlugin {
continue
}
Expand Down Expand Up @@ -152,7 +152,7 @@ func init() {
}
inst, err := plugin.Instance()
if err != nil {
return nil, fmt.Errorf("failed to get instance for diff plugin %q: %w", name, err)
return nil, fmt.Errorf("failed to get instance for diff plugin %q: %w", plugin.Registration.ID, err)
}
applier = inst.(diff.Applier)
applierID = plugin.Registration.ID
Expand Down
2 changes: 1 addition & 1 deletion script/setup/install-dev-tools
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ set -eu -o pipefail

go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.3.0
go install github.com/cpuguy83/go-md2man/v2@v2.0.7
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.5
go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.9.0
go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@v1.2.7
go install github.com/bufbuild/buf/cmd/buf@v1.63.0
Loading