diff --git a/Makefile b/Makefile index 8aa1cd045c01f8b338aa5bfe709a982e96517039..b9899db34f3431461fe55d7d9da9f52bbc5dc935 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 be2919c1e8bdfe6642e1194560b4c0dbb134bac5..7eb9ab69948d619a524ae62cc8f39773b6521fa8 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 a608dd15e896e417aa25e19ee8657c037aa3e75e..f0d1f75fbf1990c015944c771976a5de4f466dc5 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"