diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f79e438ad..22258b2cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - uses: actions/checkout@v2 - uses: golangci/golangci-lint-action@v3 with: - version: v1.45.0 + version: v1.46.2 skip-cache: true args: --timeout=5m diff --git a/pkg/cri/store/container/status_test.go b/pkg/cri/store/container/status_test.go index d4b2542bf..29d892f79 100644 --- a/pkg/cri/store/container/status_test.go +++ b/pkg/cri/store/container/status_test.go @@ -131,8 +131,7 @@ func TestStatus(t *testing.T) { t.Logf("failed update should not take effect") err = s.Update(func(o Status) (Status, error) { - o = updateStatus - return o, updateErr + return updateStatus, updateErr }) assert.Equal(updateErr, err) assert.Equal(testStatus, s.Get()) @@ -142,8 +141,7 @@ func TestStatus(t *testing.T) { t.Logf("successful update should take effect but not checkpoint") err = s.Update(func(o Status) (Status, error) { - o = updateStatus - return o, nil + return updateStatus, nil }) assert.NoError(err) assert.Equal(updateStatus, s.Get()) @@ -152,14 +150,12 @@ func TestStatus(t *testing.T) { assert.Equal(testStatus, loaded) // Recover status. assert.NoError(s.Update(func(o Status) (Status, error) { - o = testStatus - return o, nil + return testStatus, nil })) t.Logf("failed update sync should not take effect") err = s.UpdateSync(func(o Status) (Status, error) { - o = updateStatus - return o, updateErr + return updateStatus, updateErr }) assert.Equal(updateErr, err) assert.Equal(testStatus, s.Get()) @@ -169,8 +165,7 @@ func TestStatus(t *testing.T) { t.Logf("successful update sync should take effect and checkpoint") err = s.UpdateSync(func(o Status) (Status, error) { - o = updateStatus - return o, nil + return updateStatus, nil }) assert.NoError(err) assert.Equal(updateStatus, s.Get()) diff --git a/pkg/cri/store/sandbox/status_test.go b/pkg/cri/store/sandbox/status_test.go index ad27db0c6..fc74629b0 100644 --- a/pkg/cri/store/sandbox/status_test.go +++ b/pkg/cri/store/sandbox/status_test.go @@ -45,16 +45,14 @@ func TestStatus(t *testing.T) { t.Logf("failed update should not take effect") err := s.Update(func(o Status) (Status, error) { - o = updateStatus - return o, updateErr + return updateStatus, updateErr }) assert.Equal(updateErr, err) assert.Equal(testStatus, s.Get()) t.Logf("successful update should take effect but not checkpoint") err = s.Update(func(o Status) (Status, error) { - o = updateStatus - return o, nil + return updateStatus, nil }) assert.NoError(err) assert.Equal(updateStatus, s.Get()) diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index 308b1e2a0..eaa387d3c 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -24,7 +24,7 @@ set -eu -o pipefail go install github.com/containerd/protobuild@v0.2.0 go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.2.0 go install github.com/cpuguy83/go-md2man/v2@v2.0.1 -go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.42.0 +go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2 go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@944ef4a40df3446714a823207972b7d9858ffac5