Chore: format code & update dependencies (#385)

* Chore: check Go modules before test & update dependencies * Chore: run go fmt to format code
p4gefau1t · Sep 14, 2021 · 2dc60f5 · 2dc60f5
1 parent 6341a5e
commit 2dc60f5
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 445 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,5 +33,11 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Check Go modules
+        run: |
+          go mod tidy -compat=1.17
+          git diff --exit-code go.mod go.sum
+          go mod verify
+
       - name: Test
         run: make test
diff --git a/component/api.go b/component/api.go
@@ -1,3 +1,4 @@
+//go:build api || full
 // +build api full
 
 package build

diff --git a/component/client.go b/component/client.go
@@ -1,3 +1,4 @@
+//go:build client || full || mini
 // +build client full mini
 
 package build

diff --git a/component/custom.go b/component/custom.go
@@ -1,3 +1,4 @@
+//go:build custom || full
 // +build custom full
 
 package build

diff --git a/component/forward.go b/component/forward.go
@@ -1,3 +1,4 @@
+//go:build forward || full || mini
 // +build forward full mini
 
 package build

diff --git a/component/mysql.go b/component/mysql.go
@@ -1,3 +1,4 @@
+//go:build mysql || full || mini
 // +build mysql full mini
 
 package build

diff --git a/component/nat.go b/component/nat.go
@@ -1,3 +1,4 @@
+//go:build nat || full || mini
 // +build nat full mini
 
 package build

diff --git a/component/other.go b/component/other.go
@@ -1,3 +1,4 @@
+//go:build other || full
 // +build other full
 
 package build

diff --git a/component/server.go b/component/server.go
@@ -1,3 +1,4 @@
+//go:build server || full || mini
 // +build server full mini
 
 package build

diff --git a/go.mod b/go.mod
@@ -9,9 +9,9 @@ require (
 	github.com/smartystreets/goconvey v1.6.4
 	github.com/stretchr/testify v1.7.0
 	github.com/txthinking/socks5 v0.0.0-20210716140126-fa1f52a8f2da
-	github.com/v2fly/v2ray-core/v4 v4.41.1
+	github.com/v2fly/v2ray-core/v4 v4.42.1
 	github.com/xtaci/smux v1.5.15
-	golang.org/x/net v0.0.0-20210825183410-e898025ed96a
+	golang.org/x/net v0.0.0-20210913180222-943fd674d43e
 	golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
 	google.golang.org/grpc v1.40.0
@@ -22,7 +22,7 @@ require (
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20210420193930-a4630ec28c79 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pires/go-proxyproto v0.6.0 // indirect
@@ -32,8 +32,8 @@ require (
 	github.com/txthinking/runnergroup v0.0.0-20210608031112-152c7c4432bf // indirect
 	github.com/txthinking/x v0.0.0-20210326105829-476fab902fbe // indirect
 	go.starlark.net v0.0.0-20210602144842-1cdb82c9e17a // indirect
-	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
+	golang.org/x/sys v0.0.0-20210820121016-41cdb8703e55 // indirect
 	golang.org/x/text v0.3.6 // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/proxy/nat/nat.go b/proxy/nat/nat.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package nat

diff --git a/tunnel/tproxy/config.go b/tunnel/tproxy/config.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

diff --git a/tunnel/tproxy/conn.go b/tunnel/tproxy/conn.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

diff --git a/tunnel/tproxy/getsockopt.go b/tunnel/tproxy/getsockopt.go
@@ -1,3 +1,4 @@
+//go:build linux && !386
 // +build linux,!386
 
 package tproxy

diff --git a/tunnel/tproxy/getsockopt_i386.go b/tunnel/tproxy/getsockopt_i386.go
@@ -1,3 +1,4 @@
+//go:build linux && 386
 // +build linux,386
 
 package tproxy

diff --git a/tunnel/tproxy/server.go b/tunnel/tproxy/server.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

diff --git a/tunnel/tproxy/tcp.go b/tunnel/tproxy/tcp.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

diff --git a/tunnel/tproxy/tunnel.go b/tunnel/tproxy/tunnel.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy

diff --git a/tunnel/tproxy/udp.go b/tunnel/tproxy/udp.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package tproxy