upgrade to golang1.18

wwqgtxx · Mar 16, 2022 · 134f0fd · 134f0fd
1 parent eebccfd
commit 134f0fd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,8 +13,8 @@ jobs:
     steps:
     - uses: actions/setup-go@v1
       with:
-        go-version: 1.17
-    - run: go get github.com/mitchellh/gox
+        go-version: 1.18
+    - run: go install github.com/mitchellh/gox@latest
     - uses: actions/checkout@v2
     - run: PATH=$HOME/go/bin:$PATH ./crossbuild.sh
     - uses: actions/upload-artifact@v1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,8 +13,8 @@ jobs:
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
     - uses: actions/setup-go@v1
       with:
-        go-version: 1.17
-    - run: go get github.com/mitchellh/gox
+        go-version: 1.18
+    - run: go install github.com/mitchellh/gox@latest
     - uses: actions/checkout@v2
     - run: PATH=$HOME/go/bin:$PATH ./crossbuild.sh
     - uses: svenstaro/[email protected]

diff --git a/go.mod b/go.mod
@@ -1,8 +1,8 @@
 module github.com/wwqgtxx/wstunnel
 
-go 1.17
+go 1.18
 
 require (
-	github.com/gorilla/websocket v1.4.2
+	github.com/gorilla/websocket v1.5.0
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=

diff --git a/tunnel.go b/tunnel.go
@@ -15,7 +15,7 @@ const (
 )
 
 var (
-	BufPool         = sync.Pool{New: func() interface{} { return make([]byte, BufSize) }}
+	BufPool         = sync.Pool{New: func() any { return make([]byte, BufSize) }}
 	WriteBufferPool = &sync.Pool{}
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ const ( @@
     )
     var (
-    	BufPool         = sync.Pool{New: func() interface{} { return make([]byte, BufSize) }}
+    	BufPool         = sync.Pool{New: func() any { return make([]byte, BufSize) }}
     	WriteBufferPool = &sync.Pool{}
     )
@@ Expand Down @@