improve lint

ammario · ammario · commit 0b268563323a · 2023-06-10T19:37:31.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -93,7 +93,8 @@ jobs:
           echo "${{ toJSON(steps.filter )}}"
 
   lint:
-    runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    # golangci-lint is heavily parallelizable.
+    runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-32vcpu-ubuntu-2204' || 'ubuntu-latest' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -102,7 +103,7 @@ jobs:
 
       - uses: ./.github/actions/setup-node
 
-      # Check for any typos!
+      # Check for any typos
       - name: Check for typos
         uses: crate-ci/typos@v1.14.12
         with:
@@ -115,28 +116,16 @@ jobs:
           cargo install typos-cli
           typos -c .github/workflows/typos.toml -w"
 
-      # Check for Go linting errors!
-      - name: install golangci-lint
-        run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
-
-      - name: make lint
-        run: |
-          make --output-sync -j lint
 
-      # Make sure the Helm chart is linted!
+      # Needed for helm chart linting
       - name: Install helm
         uses: azure/setup-helm@v3
         with:
           version: v3.9.2
 
-      - name: Lint Helm chart
+      - name: make lint
         run: |
-          cd helm
-          make lint
-
-      # Ensure AGPL and Enterprise are separated!
-      - name: Check for AGPL code importing Enterprise...
-        run: ./scripts/check_enterprise_imports.sh
+          make --output-sync -j lint
 
   gen:
     timeout-minutes: 8
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -200,7 +200,6 @@ issues:
   max-same-issues: 0
 
 run:
-  concurrency: 4
   skip-dirs:
     - node_modules
   skip-files:
diff --git a/Makefile b/Makefile
@@ -402,11 +402,17 @@ else
 endif
 .PHONY: fmt/shfmt
 
-lint: lint/shellcheck lint/go
+lint: lint/shellcheck lint/go lint/ts lint/helm lint/agpl
 .PHONY: lint
 
+lint/ts:
+	cd site
+	yarn && yarn lint
+.PHONY: lint/ts
+
 lint/go:
 	./scripts/check_enterprise_imports.sh
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
 	golangci-lint run
 .PHONY: lint/go
 
@@ -416,6 +422,15 @@ lint/shellcheck: $(SHELL_SRC_FILES)
 	shellcheck --external-sources $(SHELL_SRC_FILES)
 .PHONY: lint/shellcheck
 
+lint/helm:
+	cd helm
+	make lint
+.PHONY: lint/helm
+
+lint/agpl:
+	./scripts/check_enterprise_imports.sh
+.PHONY: lint/agpl
+
 # all gen targets should be added here and to gen/mark-fresh
 gen: \
 	coderd/database/dump.sql \
diff --git a/enterprise/cli/root_internal_test.go b/enterprise/cli/root_internal_test.go
@@ -3,9 +3,10 @@ package cli
 import (
 	"testing"
 
-	"github.com/coder/coder/cli"
 	"github.com/stretchr/testify/require"
 
+	"github.com/coder/coder/cli"
+
 	"github.com/coder/coder/cli/clibase"
 
 	"github.com/coder/coder/cli/clitest"
