Skip to content
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.

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

ci: bump golangci-lint to v1.44, golangci-lint-action to v3 #3370

Merged
merged 3 commits into from Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 14 additions & 8 deletions .github/workflows/validate.yml
Expand Up @@ -7,21 +7,25 @@ on:
- master
- release-*
pull_request:
env:
GO_VERSION: 1.17.x

jobs:

lint:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v2
with:
go-version: "${{ env.GO_VERSION }}"
- name: install deps
run: |
sudo apt -q update
sudo apt -q install libseccomp-dev
- uses: golangci/golangci-lint-action@v2
- uses: golangci/golangci-lint-action@v3
with:
# must be specified without patch version
version: v1.42
version: v1.44

lint-extra:
# Extra linters, only checking new code from pull requests.
Expand All @@ -31,16 +35,18 @@ jobs:
contents: read
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v2
with:
go-version: "${{ env.GO_VERSION }}"
- name: install deps
run: |
sudo apt -q update
sudo apt -q install libseccomp-dev
- uses: golangci/golangci-lint-action@v2
- uses: golangci/golangci-lint-action@v3
with:
only-new-issues: true
args: --config .golangci-extra.yml
# must be specified without patch version
version: v1.43
version: v1.44


compile-buildtags:
Expand All @@ -53,7 +59,7 @@ jobs:
- name: install go
uses: actions/setup-go@v2
with:
go-version: 1.x # Latest stable
go-version: "${{ env.GO_VERSION }}"
- name: compile with no build tags
run: make BUILDTAGS=""

Expand Down Expand Up @@ -120,7 +126,7 @@ jobs:
- name: install go
uses: actions/setup-go@v2
with:
go-version: 1.x # Latest stable
go-version: "${{ env.GO_VERSION }}"
- name: cache go mod and $GOCACHE
uses: actions/cache@v2
with:
Expand Down
3 changes: 1 addition & 2 deletions libcontainer/cgroups/ebpf/devicefilter/devicefilter_test.go
Expand Up @@ -153,8 +153,7 @@ func TestDeviceFilter_Privileged(t *testing.T) {
Allow: true,
},
}
expected :=
`
expected := `
// load parameters into registers
0: LdXMemW dst: r2 src: r1 off: 0 imm: 0
1: And32Imm dst: r2 imm: 65535
Expand Down
4 changes: 0 additions & 4 deletions libcontainer/process_linux.go
Expand Up @@ -39,13 +39,9 @@ type parentProcess interface {

// startTime returns the process start time.
startTime() (uint64, error)

signal(os.Signal) error

externalDescriptors() []string

setExternalDescriptors(fds []string)

forwardChildLogs() chan error
}

Expand Down
2 changes: 0 additions & 2 deletions update.go
Expand Up @@ -194,7 +194,6 @@ other options are ignored.
opt string
dest *uint64
}{

{"cpu-period", r.CPU.Period},
{"cpu-rt-period", r.CPU.RealtimePeriod},
{"cpu-share", r.CPU.Shares},
Expand All @@ -211,7 +210,6 @@ other options are ignored.
opt string
dest *int64
}{

{"cpu-quota", r.CPU.Quota},
{"cpu-rt-runtime", r.CPU.RealtimeRuntime},
} {
Expand Down