Skip to content

Commit

Permalink
Merge pull request cri-o#7054 from saschagrunert/golangci-lint
Browse files Browse the repository at this point in the history
Update golangci-lint and config
  • Loading branch information
openshift-merge-robot committed Jun 15, 2023
2 parents b5fd4f9 + e3b7406 commit bac3ee7
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:
env:
GO_VERSION: '1.20'
GOLANGCI_LINT_VERSION: v1.52.2
GOLANGCI_LINT_VERSION: v1.53.2
permissions:
contents: read

Expand Down
6 changes: 5 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ linters:
- bidichk
- bodyclose
- decorder
- depguard
- dogsled
- dupl
- dupword
Expand All @@ -42,12 +41,14 @@ linters:
- goimports
- goprintffuncname
- gosimple
- gosmopolitan
- govet
- grouper
- importas
- ineffassign
- logrlint
- makezero
- mirror
- misspell
- musttag
- nakedret
Expand All @@ -58,6 +59,7 @@ linters:
- sqlclosecheck
- staticcheck
- stylecheck
- tagalign
- tenv
- testableexamples
- tparallel
Expand All @@ -67,9 +69,11 @@ linters:
- unused
- usestdlibvars
- whitespace
- zerologlint
# - containedctx
# - contextcheck
# - cyclop
# - depguard
# - errname
# - errorlint
# - exhaustive
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ GINKGO := ${BUILD_BIN_PATH}/ginkgo
MOCKGEN := ${BUILD_BIN_PATH}/mockgen
MOCKGEN_VERSION := 1.6.0
GOLANGCI_LINT := ${BUILD_BIN_PATH}/golangci-lint
GOLANGCI_LINT_VERSION := v1.52.2
GOLANGCI_LINT_VERSION := v1.53.2
GO_MOD_OUTDATED := ${BUILD_BIN_PATH}/go-mod-outdated
GO_MOD_OUTDATED_VERSION := 0.9.0
GOSEC := ${BUILD_BIN_PATH}/gosec
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
match: golang_version

- name: golangci-lint
version: v1.52.2
version: v1.53.2
refPaths:
- path: .github/workflows/verify.yml
match: GOLANGCI_LINT_VERSION
Expand Down

0 comments on commit bac3ee7

Please sign in to comment.