From f0d87d13d6d9fcc17d499aae876313def9b7eca3 Mon Sep 17 00:00:00 2001
From: Shelikhoo <xiaokangwang@outlook.com>
Date: Sat, 17 May 2025 21:57:59 +0100
Subject: [PATCH] Update linter version

---
 .github/linters/.golangci.yml | 89 ++++++++++++++++++++---------------
 .github/workflows/linter.yml  |  4 +-
 2 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/.github/linters/.golangci.yml b/.github/linters/.golangci.yml
index a1beafd39..2f1df8076 100644
--- a/.github/linters/.golangci.yml
+++ b/.github/linters/.golangci.yml
@@ -1,57 +1,70 @@
-run:
-  timeout: 5m
-
-issues:
-  new: true
-  exclude-rules:
-    - linters:
-        - staticcheck
-      text: "SA1019:"
-    - linters:
-        - stylecheck
-      text: "ST1016:"
-  exclude-files:
-    - generated.*
-    - .pb.go
-
+version: "2"
 linters:
   enable:
     - asciicheck
     - bodyclose
     - depguard
     - gocritic
-    - gofmt
-    - gofumpt
-    - goimports
     - goprintffuncname
-    - gosimple
-    - govet
-    - ineffassign
     - misspell
     - nakedret
     - revive
     - rowserrcheck
     - staticcheck
-    - stylecheck
-    - typecheck
     - unconvert
     - unparam
     - whitespace
   disable:
     - errcheck
     - unused
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/v2fly/v2ray-core
-  revive:
+  settings:
+    depguard:
+      rules:
+        Main:
+          deny:
+            - pkg: github.com/pkg/errors
+              desc: Should be replaced by standard lib errors package
+    revive:
+      rules:
+        - name: blank-imports
+          severity: warning
+          disabled: true
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      - name: blank-imports
-        severity: warning
-        disabled: true
-  depguard:
-    rules:
-      Main:
-        deny:
-          - pkg: "github.com/pkg/errors"
-            desc: Should be replaced by standard lib errors package
+      - linters:
+          - staticcheck
+        text: 'SA1019:'
+      - linters:
+          - staticcheck
+        text: 'ST1016:'
+    paths:
+      - generated.*
+      - .pb.go
+      - third_party$
+      - builtin$
+      - examples$
+issues:
+  new: true
+formatters:
+  enable:
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    goimports:
+      local-prefixes:
+        - github.com/v2fly/v2ray-core
+  exclusions:
+    generated: lax
+    paths:
+      - generated.*
+      - .pb.go
+      - third_party$
+      - builtin$
+      - examples$
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 702f41ea9..8726d2ffc 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -28,8 +28,8 @@ jobs:
         uses: actions/checkout@v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.63
+          version: v2.1.6
           args: --config=.github/linters/.golangci.yml
           only-new-issues: true