From f2998037e5fd2fbfa30c4575d05d09722f52f67a Mon Sep 17 00:00:00 2001
From: Serge Zaitsev <serge.zaitsev@grafana.com>
Date: Thu, 7 Nov 2024 19:05:10 +0100
Subject: [PATCH] Chore: Clean up some excludes and fix makefile (#96052)

clean up some excludes and fix makefile
---
 .golangci.yml | 3 ---
 Makefile      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index d967e0c33f9..d0a9f4b46f6 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -230,9 +230,6 @@ issues:
   exclude-dirs:
     - devenv
     - scripts
-  exclude-files:
-    - pkg/util/xorm/*.go
-    - pkg/build/wire/*.go
   exclude-rules:
     - linters:
         - stylecheck
diff --git a/Makefile b/Makefile
index ccabdbd733a..0279597db97 100644
--- a/Makefile
+++ b/Makefile
@@ -305,7 +305,7 @@ test: test-go test-js ## Run all tests.
 golangci-lint: $(GOLANGCI_LINT)
 	@echo "lint via golangci-lint"
 	$(GOLANGCI_LINT) run \
-		--config .golangci.toml \
+		--config .golangci.yml \
 		$(GO_LINT_FILES)
 
 .PHONY: lint-go