wip

quite · Aug 15, 2024 · 5216a5f · 5216a5f
1 parent 5c57551
commit 5216a5f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1,155 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -22,7 +22,7 @@ linters:
     - gocognit
     - nestif
     - exhaustruct  # TODO? annoying for now
-    - goerr113  # TODO enable later
+    - err113  # TODO enable later
     - godot
     - godox
     - depguard

diff --git a/Makefile b/Makefile
@@ -19,11 +19,6 @@ check-deviceapp-hashes:
 clean:
 	rm -f age-plugin-tkey
 
-.PHONY: lint
-lint:
-	make -C gotools golangci-lint
-	./gotools/golangci-lint run
-
 
 .PHONY: build-in-container
 build-in-container:
@@ -33,3 +28,15 @@ build-in-container:
 build-image:
 	#--pull=always --no-cache
 	podman build -t localhost/tkey-apps-builder -f Containerfile
+
+
+golangci_version=v1.60.1
+golangci_cachedir=$(HOME)/.cache/golangci-lint-$(golangci_version)
+.PHONY: lint
+lint:
+	mkdir -p $(golangci_cachedir)
+	podman run --rm -it \
+		-v $$(pwd):/src -w /src \
+		-v $(golangci_cachedir):/root/.cache \
+		docker.io/golangci/golangci-lint:$(golangci_version)-alpine \
+		golangci-lint run
diff --git a/gotools/Makefile b/gotools/Makefile
diff --git a/gotools/go.mod b/gotools/go.mod