From 9231082be8b8bbb055015bed8082d98e18c596a1 Mon Sep 17 00:00:00 2001
From: Neil-Jocelyn Schark <neil.schark@h-da.de>
Date: Thu, 28 Mar 2024 14:23:17 +0000
Subject: [PATCH] Improve linting output for local linter
See merge request danet/gosdn!813
---
.gitlab/ci/.code-quality-ci.yml | 4 ++--
.golangci.yml | 5 ++++-
Makefile | 4 ++--
makefiles/ci/Makefile | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 8db3b339e..8bc8c35f0 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -7,9 +7,9 @@ code-quality:
- make ci-lint
artifacts:
reports:
- codequality: gl-code-quality-report.json
+ codequality: gl-codeclimate.json
paths:
- - gl-code-quality-report.json
+ - gl-codeclimate.json
needs: []
code-vulnerability:
diff --git a/.golangci.yml b/.golangci.yml
index 981b96103..30f446c5c 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -24,7 +24,10 @@ run:
# output settings -> code-climate for GitLab
output:
- format: code-climate
+ formats:
+ - format: code-climate
+ path: gl-codeclimate.json
+ - format: colored-line-number
print-issued-lines: true
print-linter-name: true
uniq-by-line: true
diff --git a/Makefile b/Makefile
index fa3381162..99ac40d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@ install-tools:
@echo Finished installing development tooling
lint: install-tools
- ./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml | jq
+ ./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml
lint-fix: install-tools
- ./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml --fix | jq
+ ./$(TOOLS_DIR)/golangci-lint run --config .golangci.yml --fix
build: pre build-gosdn build-gosdnc build-plugin-registry build-venv-manager build-arista-routing-engine-app build-hostname-checker-app build-basic-interface-monitoring-app
diff --git a/makefiles/ci/Makefile b/makefiles/ci/Makefile
index dae623fa2..4593b4877 100644
--- a/makefiles/ci/Makefile
+++ b/makefiles/ci/Makefile
@@ -2,4 +2,4 @@ ci-install-tools:
go install gotest.tools/gotestsum@$(GOTESTSUM_VERSION)
ci-lint: ci-install-tools
- golangci-lint run --config .golangci.yml --out-format code-climate
+ golangci-lint run --config .golangci.yml
--
GitLab