From f845cffeacb4a5a3efe88a9b04b7c7059c4cd8b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sat, 14 Sep 2024 14:40:11 +0800
Subject: [PATCH] Update linter configuration

---
 .github/workflows/lint.yml                | 13 ++++---
 .github/workflows/{debug.yml => test.yml} | 46 +++++++++++++++--------
 .golangci.yml                             | 24 ++++++------
 Makefile                                  |  3 +-
 tun_linux.go                              |  4 +-
 5 files changed, 54 insertions(+), 36 deletions(-)
 rename .github/workflows/{debug.yml => test.yml} (67%)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2947450..c682b25 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,4 +1,4 @@
-name: Lint
+name: lint
 
 on:
   push:
@@ -24,16 +24,17 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
       - name: Cache go module
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/go/pkg/mod
           key: go-${{ hashFiles('**/go.sum') }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: latest
\ No newline at end of file
+          version: latest
+          args: .
\ No newline at end of file
diff --git a/.github/workflows/debug.yml b/.github/workflows/test.yml
similarity index 67%
rename from .github/workflows/debug.yml
rename to .github/workflows/test.yml
index 7ae30fa..3afe968 100644
--- a/.github/workflows/debug.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Debug build
+name: test
 
 on:
   push:
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    name: Linux Debug build
+    name: Linux
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -24,14 +24,14 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
       - name: Build
         run: |
           make test
   build_go120:
-    name: Linux Debug build (Go 1.20)
+    name: Linux (Go 1.20)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,7 +39,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ~1.20
         continue-on-error: true
@@ -47,7 +47,7 @@ jobs:
         run: |
           make test
   build_go121:
-    name: Linux Debug build (Go 1.21)
+    name: Linux (Go 1.21)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -55,15 +55,31 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ~1.21
         continue-on-error: true
       - name: Build
         run: |
           make test
-  build__windows:
-    name: Windows Debug build
+  build_go122:
+    name: Linux (Go 1.22)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ~1.22
+        continue-on-error: true
+      - name: Build
+        run: |
+          make test
+  build_windows:
+    name: Windows
     runs-on: windows-latest
     steps:
       - name: Checkout
@@ -71,15 +87,15 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
         continue-on-error: true
       - name: Build
         run: |
           make test
   build_darwin:
-    name: macOS Debug build
+    name: macOS
     runs-on: macos-latest
     steps:
       - name: Checkout
@@ -87,9 +103,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.22
+          go-version: ^1.23
         continue-on-error: true
       - name: Build
         run: |
diff --git a/.golangci.yml b/.golangci.yml
index 7aa7aff..eecfec3 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -3,18 +3,18 @@ linters:
   enable:
     - gofumpt
     - govet
-#    - gci
+    - gci
     - staticcheck
-
-issues:
-  exclude-dirs:
-    - internal
+    - paralleltest
+    - ineffassign
 
 linters-settings:
-#  gci:
-#    sections:
-#      - standard
-#      - prefix(github.com/sagernet/sing)
-#      - default
-  staticcheck:
-    go: '1.19'
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - prefix(github.com/sagernet/)
+      - default
+
+run:
+  go: "1.23"
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 880626a..82c22d2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,4 +27,5 @@ lint_install:
 	go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 
 test:
-	go test -v .
\ No newline at end of file
+	go build -v .
+	#go test -v .
diff --git a/tun_linux.go b/tun_linux.go
index 6153abe..fd6fc66 100644
--- a/tun_linux.go
+++ b/tun_linux.go
@@ -712,7 +712,7 @@ func (t *NativeTun) rules() []*netlink.Rule {
 			it.Family = unix.AF_INET
 			rules = append(rules, it)
 		}
-		priority++
+		// priority++
 	}
 	if p6 {
 		it = netlink.NewRule()
@@ -755,7 +755,7 @@ func (t *NativeTun) rules() []*netlink.Rule {
 		it.Table = t.options.IPRoute2TableIndex
 		it.Family = unix.AF_INET6
 		rules = append(rules, it)
-		priority6++
+		// priority6++
 	}
 	if p4 {
 		it = netlink.NewRule()