From 1807c96e391c13279ff20ac3f82e2151efe528ac Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Feb 2022 15:21:25 +0100 Subject: [PATCH 1/4] gha: update to go1.17 and gofmt Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 2 +- console_linux.go | 1 + console_test.go | 1 + console_unix.go | 1 + console_zos.go | 3 ++- pty_freebsd_cgo.go | 1 + pty_freebsd_nocgo.go | 1 + pty_unix.go | 1 + tc_freebsd_cgo.go | 1 + tc_freebsd_nocgo.go | 1 + tc_openbsd_cgo.go | 1 + tc_openbsd_nocgo.go | 1 + tc_solaris_cgo.go | 1 + tc_solaris_nocgo.go | 1 + tc_unix.go | 1 + 15 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5b4f34..423878b 100644 --- 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 diff --git a/console_linux.go b/console_linux.go index c1c839e..28b77b7 100644 --- 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 index 59ef35c..671f2f0 100644 --- 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 index a081176..164dd59 100644 --- 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 index b348a83..06b059b 100644 --- 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 index cbd3cd7..2236862 100644 --- 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 index b5e4318..ceb90a4 100644 --- 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 index d5a6bd8..b090252 100644 --- 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 index 0f3d272..3328257 100644 --- 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 index 087fc15..18a9b9c 100644 --- 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 index f0cec06..0e76f6c 100644 --- 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 index daccce2..dca9241 100644 --- 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 index e36a68e..c755a9b 100644 --- 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 index eb0bd2c..29c07d4 100644 --- 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 index a6bf01e..947cb75 100644 --- 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 /* From 5eaa14b42330aed70adac14cefae16ac5befcf0a Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Feb 2022 15:22:15 +0100 Subject: [PATCH 2/4] gha: use go install instead of go get (as it's deprecated) Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 423878b..a6dd470 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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.23.8 - name: Check DCO/whitespace/commit message env: From 6939505c1011f7bf8bfb52fca28757246a42e4a9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Feb 2022 15:23:24 +0100 Subject: [PATCH 3/4] gha: update golangci-lint to v1.44.0 Signed-off-by: Sebastiaan van Stijn --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6dd470..1971ee1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: | 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.23.8 + go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44.0 - name: Check DCO/whitespace/commit message env: From 4b3f90d35d2b799feb1e3f5b982bf6cdf8e1f49f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 11 Feb 2022 15:25:26 +0100 Subject: [PATCH 4/4] golang-ci: sort linters, and replace golint (deprecated) with revive Signed-off-by: Sebastiaan van Stijn --- .golangci.yml | 14 +++++++------- console.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fcba5e8..abe3d84 100644 --- 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 index f989d28..810a71f 100644 --- 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