chore: Go 1.19

Signed-off-by: Valery Piashchynski <[email protected]>
roadrunner-server · Aug 4, 2022 · a6344e3 · a6344e3
1 parent b1c2596
commit a6344e3
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -10,14 +10,14 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
 
-      - name: Set up Go 1.18
+      - name: Set up Go 1.19
         uses: actions/setup-go@v3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: Run linter
         uses: golangci/[email protected] # Action page: <https://github.com/golangci/golangci-lint-action>
         with:
-          version: v1.47 # without patch version
+          version: v1.48 # without patch version
           only-new-issues: false # show only new issues if it's a pull request
           args: --timeout=10m
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        go: ["1.18"]
+        go: ["1.19"]
         os: ["ubuntu-latest", "macos-latest"]
     steps:
       - name: Set up Go ${{ matrix.go }}

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,7 @@
 # Documentation: <https://github.com/golangci/golangci-lint#config-file>
 
 run:
+  go: '1.17'
   timeout: 1m
   skip-dirs:
     - .github

diff --git a/socket_darwin.go b/socket_darwin.go
@@ -1,5 +1,4 @@
 //go:build darwin
-// +build darwin
 
 package tcplisten
 

diff --git a/socket_other.go b/socket_other.go
@@ -1,5 +1,4 @@
 //go:build !darwin
-// +build !darwin
 
 package tcplisten
 

diff --git a/tcplisten.go b/tcplisten.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || rumprun
-// +build linux darwin dragonfly freebsd netbsd openbsd rumprun
 
 // Package tcplisten provides customizable TCP net.Listener with various
 // performance-related options:

diff --git a/tcplisten_bsd.go b/tcplisten_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd || rumprun
-// +build darwin dragonfly freebsd netbsd openbsd rumprun
 
 package tcplisten
 

diff --git a/tcplisten_linux.go b/tcplisten_linux.go
@@ -1,11 +1,9 @@
 //go:build linux
-// +build linux
 
 package tcplisten
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -34,7 +32,7 @@ func enableFastOpen(fd int) error {
 const fastOpenQlen = 16 * 1024
 
 func soMaxConn() (int, error) {
-	data, err := ioutil.ReadFile(soMaxConnFilePath)
+	data, err := os.ReadFile(soMaxConnFilePath)
 	if err != nil {
 		// This error may trigger on travis build. Just use SOMAXCONN
 		if os.IsNotExist(err) {