Merge pull request #16022 from tao12345666333/clean-root-dir

ci: move .golangci.yaml to tools dir
etcd-io · Jun 7, 2023 · faf5945 · faf5945
2 parents d3e43d4 + 0f32b58
commit faf5945
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml
@@ -17,6 +17,7 @@ jobs:
         uses: golangci/golangci-lint-action@5f1fec7010f6ae3b84ea4f7b2129beb8639b564f # v3.5.0
         with:
           version: v1.49.0
+          args: --config tools/.golangci.yaml
       - name: protoc
         uses: arduino/setup-protoc@149f6c87b92550901b26acd1632e11c3662e381f # v1.3.0
         with:

diff --git a/Makefile b/Makefile
@@ -86,11 +86,11 @@ verify-dep:
 
 .PHONY: verify-lint
 verify-lint:
-	golangci-lint run
+	golangci-lint run --config tools/.golangci.yaml
 
 .PHONY: update-lint
 fix-lint:
-	golangci-lint run --fix
+	golangci-lint run --config tools/.golangci.yaml --fix
 
 .PHONY: verify-shellcheck
 verify-shellcheck:

diff --git a/.golangci.yaml → tools/.golangci.yaml b/.golangci.yaml → tools/.golangci.yaml