Skip to content

Commit 3c02862

Browse files
Claudeclaude
andcommitted
revert: restore original lint/go implementation in Makefile
This change restores the original behavior of lint/go in the Makefile while keeping the updated golangci-lint version in the Dockerfile. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 05d413a commit 3c02862

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -505,15 +505,8 @@ lint/ts: site/node_modules/.installed
505505
lint/go:
506506
./scripts/check_enterprise_imports.sh
507507
./scripts/check_codersdk_imports.sh
508-
echo "Temporarily using custom golangci-lint invocation compatible with Go 1.24.1"
509-
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8 run \
510-
--timeout 5m \
511-
--allow-parallel-runners \
512-
--disable-all \
513-
--skip-dirs="node_modules,vendor,site,helm,tailnet,vpn,provisionersdk,enterprise" \
514-
--skip-files ".*_test.go|.*\\.pb\\.go|.*_drpc\\.pb\\.go" \
515-
--enable gosimple,govet,ineffassign,staticcheck || \
516-
echo "Linting reported issues, but proceeding with the build..."
508+
linter_ver=$(shell egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/coder/Dockerfile | cut -d '=' -f 2)
509+
go run github.com/golangci/golangci-lint/cmd/golangci-lint@v$$linter_ver run
517510
.PHONY: lint/go
518511

519512
lint/examples:

0 commit comments

Comments
 (0)