From 3ac0be4e357d971d177e578bd1a749e17d307950 Mon Sep 17 00:00:00 2001
From: Viktor Pettersson <viktor.pettersson@portainer.io>
Date: Wed, 10 Sep 2025 08:28:58 +1200
Subject: [PATCH] chore(gomod): add `go mod tidy` checks in the CI BE-12233
 (#1151)

---
 Makefile     | 6 +-----
 package.json | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 552b0e6ea..e264c357f 100644
--- a/Makefile
+++ b/Makefile
@@ -54,14 +54,12 @@ client-deps: ## Install client dependencies
 tidy: ## Tidy up the go.mod file
 	@go mod tidy
 
-
 ##@ Cleanup
 .PHONY: clean
 clean: ## Remove all build and download artifacts
 	@echo "Clearing the dist directory..."
 	@rm -rf dist/*
 
-
 ##@ Testing
 .PHONY: test test-client test-server
 test: test-server test-client ## Run all tests
@@ -105,16 +103,14 @@ lint: lint-client lint-server ## Lint all code
 lint-client: ## Lint client code
 	yarn lint
 
-lint-server: ## Lint server code
+lint-server: tidy ## Lint server code
 	golangci-lint run --timeout=10m -c .golangci.yaml
 
-
 ##@ Extension
 .PHONY: dev-extension
 dev-extension: build-server build-client ## Run the extension in development mode
 	make local -f build/docker-extension/Makefile
 
-
 ##@ Docs
 .PHONY: docs-build docs-validate docs-clean docs-validate-clean
 docs-build: init-dist ## Build docs
diff --git a/package.json b/package.json
index 9038c0d02..534eaf6e4 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,7 @@
     "storybook": "storybook dev -p 6006",
     "storybook:build": "storybook build -o ./dist/storybook",
     "analyze-webpack": "webpack --config ./webpack/webpack.analyze.js",
-    "prepare": "cd ../.. && husky install package/server-ce/.husky"
-  },
+    "prepare": "cd ../.. && husky install package/server-ce/.husky && husky install .husky" },
   "engines": {
     "node": ">= 16"
   },