Merge pull request #61 from thaJeztah/update_ci

AkihiroSuda · web-flow · commit 1b12abddd84f · 2022-02-14T18:25:27.000+09:00
gha: update to go 1.17, update golangci-lint to v1.44, and gofmt
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.16.x
+        go-version: 1.17.x
       id: go
 
     - name: Setup Go binary path
@@ -39,12 +39,10 @@ jobs:
         path: src/github.com/containerd/project
 
     - name: Install dependencies
-      env:
-        GO111MODULE: off
       run: |
-        go get -u github.com/vbatts/git-validation
-        go get -u github.com/kunalkushwaha/ltag
-        GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8
+        go install github.com/vbatts/git-validation@latest
+        go install github.com/kunalkushwaha/ltag@latest
+        go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.0
 
     - name: Check DCO/whitespace/commit message
       env:
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,16 +1,16 @@
 linters:
   enable:
-    - structcheck
-    - varcheck
-    - staticcheck
-    - unconvert
     - gofmt
     - goimports
-    - golint
     - ineffassign
-    - vet
-    - unused
     - misspell
+    - revive
+    - staticcheck
+    - structcheck
+    - unconvert
+    - unused
+    - varcheck
+    - vet
   disable:
     - errcheck
 
diff --git a/console.go b/console.go
@@ -78,7 +78,7 @@ func Current() (c Console) {
 }
 
 // ConsoleFromFile returns a console using the provided file
-// nolint:golint
+// nolint:revive
 func ConsoleFromFile(f File) (Console, error) {
 	if err := checkConsole(f); err != nil {
 		return nil, err
diff --git a/console_linux.go b/console_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /*
diff --git a/console_test.go b/console_test.go
@@ -1,3 +1,4 @@
+//go:build linux || solaris || zos || freebsd
 // +build linux solaris zos freebsd
 
 /*
diff --git a/console_unix.go b/console_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin freebsd linux netbsd openbsd solaris
 
 /*
diff --git a/console_zos.go b/console_zos.go
@@ -1,3 +1,4 @@
+//go:build zos
 // +build zos
 
 /*
@@ -32,7 +33,7 @@ func NewPty() (Console, string, error) {
 	var f File
 	var err error
 	var slave string
-	for i := 0;; i++ {
+	for i := 0; ; i++ {
 		ptyp := fmt.Sprintf("/dev/ptyp%04d", i)
 		f, err = os.OpenFile(ptyp, os.O_RDWR, 0600)
 		if err == nil {
diff --git a/pty_freebsd_cgo.go b/pty_freebsd_cgo.go
@@ -1,3 +1,4 @@
+//go:build freebsd && cgo
 // +build freebsd,cgo
 
 /*
diff --git a/pty_freebsd_nocgo.go b/pty_freebsd_nocgo.go
@@ -1,3 +1,4 @@
+//go:build freebsd && !cgo
 // +build freebsd,!cgo
 
 /*
diff --git a/pty_unix.go b/pty_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || linux || netbsd || openbsd || solaris
 // +build darwin linux netbsd openbsd solaris
 
 /*
diff --git a/tc_freebsd_cgo.go b/tc_freebsd_cgo.go
@@ -1,3 +1,4 @@
+//go:build freebsd && cgo
 // +build freebsd,cgo
 
 /*
diff --git a/tc_freebsd_nocgo.go b/tc_freebsd_nocgo.go
@@ -1,3 +1,4 @@
+//go:build freebsd && !cgo
 // +build freebsd,!cgo
 
 /*
diff --git a/tc_openbsd_cgo.go b/tc_openbsd_cgo.go
@@ -1,3 +1,4 @@
+//go:build openbsd && cgo
 // +build openbsd,cgo
 
 /*
diff --git a/tc_openbsd_nocgo.go b/tc_openbsd_nocgo.go
@@ -1,3 +1,4 @@
+//go:build openbsd && !cgo
 // +build openbsd,!cgo
 
 /*
diff --git a/tc_solaris_cgo.go b/tc_solaris_cgo.go
@@ -1,3 +1,4 @@
+//go:build solaris && cgo
 // +build solaris,cgo
 
 /*
diff --git a/tc_solaris_nocgo.go b/tc_solaris_nocgo.go
@@ -1,3 +1,4 @@
+//go:build solaris && !cgo
 // +build solaris,!cgo
 
 /*
diff --git a/tc_unix.go b/tc_unix.go
@@ -1,3 +1,4 @@
+//go:build darwin || freebsd || linux || netbsd || openbsd || solaris || zos
 // +build darwin freebsd linux netbsd openbsd solaris zos
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func Current() (c Console) {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// ConsoleFromFile returns a console using the provided file`
`81`		`-// nolint:golint`
	`81`	`+// nolint:revive`
`82`	`82`	`func ConsoleFromFile(f File) (Console, error) {`
`83`	`83`	`if err := checkConsole(f); err != nil {`
`84`	`84`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build linux`
`1`	`2`	`// +build linux`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build linux \|\| solaris \|\| zos \|\| freebsd`
`1`	`2`	`// +build linux solaris zos freebsd`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build darwin \|\| freebsd \|\| linux \|\| netbsd \|\| openbsd \|\| solaris`
`1`	`2`	`// +build darwin freebsd linux netbsd openbsd solaris`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build freebsd && cgo`
`1`	`2`	`// +build freebsd,cgo`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build freebsd && !cgo`
`1`	`2`	`// +build freebsd,!cgo`
`2`	`3`
`3`	`4`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+//go:build darwin \|\| linux \|\| netbsd \|\| openbsd \|\| solaris`
`1`	`2`	`// +build darwin linux netbsd openbsd solaris`
`2`	`3`
`3`	`4`	`/*`