fixup! improve lint

ammario · ammario · commit 2cb78845234a · 2023-06-10T19:45:23.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -93,8 +93,7 @@ jobs:
           echo "${{ toJSON(steps.filter )}}"
 
   lint:
-    # golangci-lint is heavily parallelizable.
-    runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-32vcpu-ubuntu-2204' || 'ubuntu-latest' }}
+    runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -116,7 +115,6 @@ jobs:
           cargo install typos-cli
           typos -c .github/workflows/typos.toml -w"
 
-
       # Needed for helm chart linting
       - name: Install helm
         uses: azure/setup-helm@v3
@@ -125,7 +123,7 @@ jobs:
 
       - name: make lint
         run: |
-          make --output-sync -j lint
+          make --output-sync=line -j lint
 
   gen:
     timeout-minutes: 8
diff --git a/Makefile b/Makefile
@@ -402,7 +402,7 @@ else
 endif
 .PHONY: fmt/shfmt
 
-lint: lint/shellcheck lint/go lint/ts lint/helm lint/agpl
+lint: lint/shellcheck lint/go lint/ts lint/helm
 .PHONY: lint
 
 lint/ts:
@@ -427,10 +427,6 @@ lint/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 \
