jesseduffield · stefanhaller · Jul 13, 2025 · Jul 13, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -170,6 +170,7 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v8
         with:
+          # If you change this, make sure to also update scripts/golangci-lint-shim.sh
           version: v2.2.1
       - name: errors
         run: golangci-lint run

diff --git a/.gitignore b/.gitignore
@@ -14,7 +14,6 @@ coverage.txt
 .idea/
 
 # Binaries
-.bin/
 lazygit
 lazygit.exe
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -23,7 +23,7 @@
     },
   },
   "go.alternateTools": {
-    "golangci-lint-v2": "${workspaceFolder}/.bin/golangci-lint",
+    "golangci-lint-v2": "${workspaceFolder}/scripts/golangci-lint-shim.sh",
   },
   "go.lintTool": "golangci-lint-v2",
 }
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ format:
 
 .PHONY: lint
 lint:
-	./scripts/lint.sh
+	./scripts/golangci-lint-shim.sh run
 
 # For more details about integration test, see https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md.
 .PHONY: integration-test-tui

diff --git a/scripts/golangci-lint-shim.sh b/scripts/golangci-lint-shim.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+set -e
+
+# Must be kept in sync with the version in .github/workflows/ci.yml
+version="v2.2.1"
+
+go run "github.com/golangci/golangci-lint/v2/cmd/golangci-lint@$version" "$@"
diff --git a/scripts/lint.sh b/scripts/lint.sh
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ coverage.txt @@
     .idea/
     # Binaries
-    .bin/
     lazygit
     lazygit.exe
@@ Expand Down @@