From 0411caf48423d37a5b2648458a9f13f705a437ec Mon Sep 17 00:00:00 2001
From: Katharina Renk <katharina.renk@stud.h-da.de>
Date: Thu, 23 Feb 2023 14:15:11 +0000
Subject: [PATCH] Unify linter versions
See merge request danet/gosdn!425
---
Makefile | 6 +++++-
controller/Makefile | 2 +-
csbi/build/ci/.code-quality-ci.yml | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 8aa1cd045..b9899db34 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ install-tools:
@echo Install development tooling
mkdir -p $(GOSDN_PRG)
export GOBIN=$(GOSDN_PRG) && go install gotest.tools/gotestsum@v1.8.1 &&\
- go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2 &&\
+ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46 &&\
go install github.com/vektra/mockery/v2@v2.14.0 &&\
go install github.com/openconfig/ygot/generator@v0.20.2 &&\
go install github.com/andresterba/go-ygot-generator-generator@v0.0.2
@@ -114,6 +114,10 @@ containerlab-start: create-clab-dir containerize-all
cd $(CLAB_DIR) &&\
sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml
+containerlab-start-reconfigure: create-clab-dir containerize-all
+ cd $(CLAB_DIR) &&\
+ sudo containerlab deploy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml --reconfigure
+
containerlab-stop: create-clab-dir
cd $(CLAB_DIR) &&\
sudo containerlab destroy --topo $(MAKEFILE_DIR)dev_env_data/clab/gosdn.clab.yaml
diff --git a/controller/Makefile b/controller/Makefile
index be2919c1e..7eb9ab699 100644
--- a/controller/Makefile
+++ b/controller/Makefile
@@ -15,7 +15,7 @@ install-tools:
@echo Install development tooling
mkdir -p $(GOSDN_PRG)
go install gotest.tools/gotestsum@v1.7.0
- go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.1
+ go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46
go install github.com/vektra/mockery/v2@v2.14.0
@echo Finished installing development tooling
diff --git a/csbi/build/ci/.code-quality-ci.yml b/csbi/build/ci/.code-quality-ci.yml
index a608dd15e..f0d1f75fb 100644
--- a/csbi/build/ci/.code-quality-ci.yml
+++ b/csbi/build/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
code-quality:
- image: golangci/golangci-lint:latest-alpine
+ image: golangci/golangci-lint:v1.46-alpine
stage: test
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
--
GitLab