Bump linter; revise linter running

.github/workflows/ci.yaml

@@ -18,21 +18,22 @@ jobs:
       options: --user 1001
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           #fetch-depth: 0
           persist-credentials: false
 
+      - uses: actions/setup-go@v5
+        with:
+          go-version: stable
+
       - name: build
         run: ./build.sh
 
-      - name: make lint
-        run: |
-          go install golang.org/dl/go1.22.2@latest
-          $(go env GOPATH)/bin/go1.22.2 download
-          ln -s $(go env GOPATH)/bin/go1.22.2 $(go env GOPATH)/bin/go
-          PATH=$(go env GOPATH)/bin:$PATH
-          make lint
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.60.1
 
       # - name: check for SPDX tags
       #   run: ./tools/spdx-ensure

.gitignore

@@ -1,3 +1,2 @@
-/gotools/golangci-lint
 /age-plugin-tkey
 /internal/tkey/x25519.bin

.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

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=$(shell grep -A1 "uses: golangci" .github/workflows/ci.yaml | grep -o -m1 "v[0-9]\+\.[.0-9]\+")
+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