diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 00000000..027dc975 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,3 @@ +version: "2" +run: + timeout: 5m diff --git a/Makefile b/Makefile index 628b1758..7fc3524b 100644 --- a/Makefile +++ b/Makefile @@ -420,7 +420,7 @@ catalog-push: ## Push a catalog image. $(MAKE) docker-push IMG=$(CATALOG_IMG) CILIUM_EBPF_VERSION := v0.18.0 -GOLANGCI_LINT_VERSION = v1.54.2 +GOLANGCI_LINT_VERSION = v2.0.2 CLANG ?= clang CFLAGS := -O2 -g -Wall -Werror $(CFLAGS) GOOS ?= linux @@ -429,7 +429,7 @@ LOCAL_GENERATOR_IMAGE ?= ebpf-generator:latest ##@ eBPF development .PHONY: prereqs prereqs: ## Check if prerequisites are met, and installing missing dependencies - test -f $(shell go env GOPATH)/bin/golangci-lint || GOFLAGS="" go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION} + test -f $(shell go env GOPATH)/bin/golangci-lint || GOFLAGS="" go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@${GOLANGCI_LINT_VERSION} test -f $(shell go env GOPATH)/bin/bpf2go || go install github.com/cilium/ebpf/cmd/bpf2go@${CILIUM_EBPF_VERSION} test -f $(shell go env GOPATH)/bin/kind || go install sigs.k8s.io/kind@latest