move to Makefile

matifali · matifali · commit f9b2ab243759 · 2023-06-16T10:33:51.000Z
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -140,27 +140,6 @@ jobs:
         run: |
           make --output-sync=line -j lint
 
-      - name: Check for unsued npm packages
-        run: |
-          depcheck || true
-          if [ -f unused.json ]; then
-            echo "Unused dependencies found:"
-            cat unused.json
-            echo "Please review and remove these dependencies manually."
-            exit 1
-          fi
-
-      - name: Check for unsued go packages
-        run: |
-          go mod tidy
-          git diff --exit-code -- go.mod go.sum
-          if [ $? -ne 0 ]; then
-            echo "Unused Go dependencies found:"
-            git diff go.mod go.sum
-            echo "Please review and remove these dependencies manually."
-            exit 1
-          fi
-
   gen:
     timeout-minutes: 8
     runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
@@ -174,7 +153,7 @@ jobs:
 
       - name: Install sqlc
         run: |
-          curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.17.2/sqlc_1.17.2_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
+          curl -sSL https://github.com/kyleconroy/sqlc/releases/download/v1.18.0/sqlc_1.18.0_linux_amd64.tar.gz | sudo tar -C /usr/bin -xz sqlc
 
       - name: go install tools
         run: |
diff --git a/Makefile b/Makefile
@@ -408,12 +408,27 @@ lint: lint/shellcheck lint/go lint/ts lint/helm
 lint/ts:
 	cd site
 	yarn && yarn lint
+	depcheck || true
+	if [ -f unused.json ]; then
+		echo "Unused dependencies found:"
+		cat unused.json
+		echo "Please review and remove these dependencies manually."
+		exit 1
+	fi
 .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
+	go mod tidy
+	git diff --exit-code -- go.mod go.sum
+	if [ $? -ne 0 ]; then
+		echo "Unused Go dependencies found:"
+		git diff go.mod go.sum
+		echo "Please review and remove these dependencies manually."
+		exit 1
+	fi
 .PHONY: lint/go
 
 # Use shfmt to determine the shell files, takes editorconfig into consideration.
