Merge pull request #68 from silenceper/dev

fix lint error

Author: silenceper

.github/workflows/go.yml

@@ -1,45 +1,37 @@
-name: Go
+name: Go CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
-  golangci:
-    strategy:
-      matrix:
-        go-version: [ '1.16','1.17','1.18','1.19','1.20' ]
-    name: golangci-lint
+  test:
+    name: Test and Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Setup Golang ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
         with:
-          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.52.2
-  build:
-    name: Test
-    runs-on: ubuntu-latest
+          go-version: "1.23"
+          check-latest: true
+          cache: true
 
-    strategy:
-      matrix:
-        go-version: [ '1.16','1.17','1.18','1.19','1.20' ]
+      - name: Verify dependencies
+        run: go mod verify
 
-    steps:
-      - name: Setup Golang ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
+      - name: Install golangci-lint
+        uses: golangci/golangci-lint-action@v7
         with:
-          go-version: ${{ matrix.go-version }}
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Test
-        run: go test -v -race ./...
+          version: latest
+          args: --timeout=5m
+
+      - name: Run tests
+        run: go test -v -race -timeout 10m ./...
 
+      - name: Build
+        run: go build -v ./...

.github/workflows/goreleaser.yml

@@ -3,14 +3,14 @@ name: goreleaser
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.20' ]
+        go-version: ["1.23"]
 
     steps:
       - name: Setup Golang ${{ matrix.go-version }}

.golangci.yml

@@ -1,56 +1,34 @@
+version: "2"
+
 linters:
-  # please, do not use `enable-all`: it's deprecated and will be removed soon.
-  # inverted configuration with `enable-all` and `disable` is not scalable during updates of golangci-lint
-  disable-all: true
+  default: none
+  # This list of linters is not a recommendation (same thing for all this configuration file).
+  # We intentionally use a limited set of linters.
+  # See the comment on top of this file.
   enable:
     - bodyclose
-    - deadcode
-    - depguard
+    - copyloopvar
     - dogsled
     - dupl
     - errcheck
+    - errorlint
     - funlen
+    - gocheckcompilerdirectives
     - goconst
     - gocritic
     - gocyclo
-    - gofmt
-    - goimports
-    - golint
+    - godox
     - goprintffuncname
-    - gosimple
     - govet
+    - intrange
     - ineffassign
-    - interfacer
     - misspell
+    - noctx
     - nolintlint
-    - rowserrcheck
-    - scopelint
+    - revive
     - staticcheck
-    - structcheck
-    - stylecheck
-    - typecheck
+    - testifylint
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
-
-issues:
-  # Excluding configuration per-path, per-linter, per-text and per-source
-  exclude-rules:
-    - path: _test\.go
-      linters:
-        - gomnd
-    - linters:
-        - stylecheck
-      text: "ST1000:"
-    # https://github.com/go-critic/go-critic/issues/926
-    - linters:
-        - gocritic
-      text: "unnecessaryDefer:"
-
-linters-settings:
-  funlen:
-    lines: 66
-    statements: 40
-

config.go

@@ -1,3 +1,4 @@
+// Package main provides a file watcher and auto-build tool for Go applications
 package main
 
 import (

example/main.go

@@ -1,3 +1,4 @@
+// Package main provides a simple example of how to use gowatch
 package main
 
 import "fmt"

go.mod

@@ -1,16 +1,15 @@
 module github.com/silenceper/gowatch
 
-go 1.24
+go 1.23
 
 require (
-	github.com/fsnotify/fsnotify v1.8.0
+	github.com/fsnotify/fsnotify v1.9.0
 	github.com/mitchellh/go-ps v1.0.0
 	github.com/silenceper/log v0.0.0-20171204144354-e5ac7fa8a76a
 	gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0
 )
 
 require (
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 )

go.sum

@@ -1,17 +1,17 @@
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
 github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/silenceper/log v0.0.0-20171204144354-e5ac7fa8a76a h1:COf2KvPmardI1M8p2fhHsXlFS2EXSQygbGgcDYBI9Wc=
 github.com/silenceper/log v0.0.0-20171204144354-e5ac7fa8a76a/go.mod h1:nyN/YUSK3CgJjtNzm6dVTkcou+RYXNMP+XLSlzQu0m0=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0 h1:POO/ycCATvegFmVuPpQzZFJ+pGZeX22Ufu6fibxDVjU=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=

gowatch.go

@@ -65,9 +65,9 @@ func NewWatcher(paths []string, files []string) {
 						Autobuild(files)
 					}()
 				}
-			case err := <-watcher.Errors:
-				log.Errorf("%v", err)
-				log.Warnf(" %s\n", err.Error()) // No need to exit here
+			case e := <-watcher.Errors:
+				log.Errorf("%v", e)
+				log.Warnf(" %s\n", e.Error()) // No need to exit here
 			}
 		}
 	}()
@@ -91,6 +91,7 @@ func getFileModTime(path string) int64 {
 		log.Errorf("Fail to open file[ %s ]\n", err)
 		return time.Now().Unix()
 	}
+	//nolint:errcheck
 	defer f.Close()
 
 	fi, err := f.Stat()
@@ -200,9 +201,9 @@ func Kill() {
 func killAllProcesses(pid int) (err error) {
 	hasAllKilled := make(chan bool)
 	go func() {
-		pids, err := psTree(pid)
-		if err != nil {
-			log.Fatalf("getting all sub processes error: %v\n", err)
+		pids, e := psTree(pid)
+		if e != nil {
+			log.Fatalf("getting all sub processes error: %v\n", e)
 			return
 		}
 		log.Debugf("main pid: %d", pid)

version.go

@@ -2,7 +2,7 @@ package main
 
 import "fmt"
 
-const version = "1.5.3"
+const version = "1.5.5"
 
 func printVersion() {
 	fmt.Println(version)