Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: format code & update dependencies #385

Merged
merged 2 commits into from
Sep 14, 2021
Merged

Chore: format code & update dependencies #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0f0db6
Chore: check Go modules before test & update dependencies
Loyalsoldier Sep 14, 2021
2a81247
Chore: run go fmt to format code
Loyalsoldier Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions component/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build api || full
// +build api full

package build
Expand Down
1 change: 1 addition & 0 deletions component/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build client || full || mini
// +build client full mini

package build
Expand Down
1 change: 1 addition & 0 deletions component/custom.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build custom || full
// +build custom full

package build
Expand Down
1 change: 1 addition & 0 deletions component/forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build forward || full || mini
// +build forward full mini

package build
Expand Down
1 change: 1 addition & 0 deletions component/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build mysql || full || mini
// +build mysql full mini

package build
Expand Down
1 change: 1 addition & 0 deletions component/nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build nat || full || mini
// +build nat full mini

package build
Expand Down
1 change: 1 addition & 0 deletions component/other.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build other || full
// +build other full

package build
Expand Down
1 change: 1 addition & 0 deletions component/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build server || full || mini
// +build server full mini

package build
Expand Down
10 changes: 5 additions & 5 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
)
453 changes: 13 additions & 440 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions proxy/nat/nat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package nat
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/getsockopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux && !386
// +build linux,!386

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/getsockopt_i386.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux && 386
// +build linux,386

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/tcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down
1 change: 1 addition & 0 deletions tunnel/tproxy/udp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build linux
// +build linux

package tproxy
Expand Down