From a5bef386ad31b0692c5072663b074ee7bc65a177 Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Thu, 7 Nov 2024 15:44:35 -0700
Subject: [PATCH] Revert "Chore: Clean up some excludes and fix makefile"
 (#96068)

Revert "Chore: Clean up some excludes and fix makefile (#96052)"

This reverts commit f2998037e5fd2fbfa30c4575d05d09722f52f67a.
---
 .golangci.yml | 3 +++
 Makefile      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.golangci.yml b/.golangci.yml
index d0a9f4b46f6..d967e0c33f9 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -230,6 +230,9 @@ 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 0279597db97..ccabdbd733a 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.yml \
+		--config .golangci.toml \
 		$(GO_LINT_FILES)
 
 .PHONY: lint-go