Skip to content

Commit acca0c1

Browse files
authored
Merge pull request #3586 from camilamacedo86/fix-lint-ci
🌱 fix lint ci issue and update golangci-lint version
2 parents 8d859ca + 4c20e7e commit acca0c1

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Run linter
2222
uses: golangci/golangci-lint-action@v3
2323
with:
24-
version: v1.51
24+
version: v1.54
2525
only-new-issues: true # Show only new issues if it's a pull request
2626

2727
yamllint:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
9696
golangci-lint:
9797
@[ -f $(GOLANGCI_LINT) ] || { \
9898
set -e ;\
99-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.51.2 ;\
99+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) v1.54.2 ;\
100100
}
101101

102102
.PHONY: apidiff

cmd/main.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ import (
2727
kustomizecommonv1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v1"
2828
kustomizecommonv2alpha "sigs.k8s.io/kubebuilder/v3/pkg/plugins/common/kustomize/v2"
2929
"sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang"
30+
31+
//nolint:staticcheck
3032
declarativev1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/declarative/v1"
3133
deployimagev1alpha1 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/deploy-image/v1alpha1"
3234
golangv2 "sigs.k8s.io/kubebuilder/v3/pkg/plugins/golang/v2"

0 commit comments

Comments
 (0)