chore: update CI and linter

ldez · Jun 28, 2024 · 7b171cf · 7b171cf
1 parent 49360e9
commit 7b171cf
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 64 deletions.
diff --git a/.github/workflows/go-cross.yml b/.github/workflows/go-cross.yml
@@ -11,17 +11,12 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ stable ]
+        go-version: [ oldstable, stable ]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      # https://github.com/marketplace/actions/checkout
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # https://github.com/marketplace/actions/setup-go-environment
-      - name: Set up Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,20 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.55.2
+      GOLANGCI_LINT_VERSION: v1.59.1
       CGO_ENABLED: 0
 
     steps:
-
-      # https://github.com/marketplace/actions/checkout
-      - name: Check out code
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # https://github.com/marketplace/actions/setup-go-environment
-      - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,6 +1,31 @@
 run:
   timeout: 2m
 
+linters:
+  enable-all: true
+  disable:
+    - gomnd # deprecated
+    - execinquery # deprecated
+    - sqlclosecheck # not relevant (SQL)
+    - rowserrcheck # not relevant (SQL)
+    - cyclop # duplicate of gocyclo
+    - lll
+    - dupl
+    - prealloc
+    - wsl
+    - nlreturn
+    - stylecheck
+    - testpackage
+    - paralleltest
+    - tparallel
+    - wrapcheck
+    - exhaustive
+    - exhaustruct
+    - makezero
+    - godot
+    - varnamelen
+    - nilnil
+
 linters-settings:
   govet:
     enable-all: true
@@ -11,10 +36,9 @@ linters-settings:
   goconst:
     min-len: 5
     min-occurrences: 3
-  gomnd:
-    settings:
-      mnd:
-        ignored-functions: os.*
+  mnd:
+    ignored-functions:
+      - os.*
   misspell:
     locale: US
     ignore-words:
@@ -61,42 +85,11 @@ linters-settings:
   gosec:
     excludes:
       - G204
-
-linters:
-  enable-all: true
-  disable:
-    - scopelint # deprecated
-    - interfacer # deprecated
-    - maligned # deprecated
-    - golint # deprecated
-    - exhaustivestruct # deprecated
-    - scopelint # deprecated
-    - varcheck # deprecated
-    - structcheck # deprecated
-    - nosnakecase # deprecated
-    - deadcode # deprecated
-    - ifshort # deprecated
-    - sqlclosecheck # not relevant (SQL)
-    - rowserrcheck # not relevant (SQL)
-    - cyclop # duplicate of gocyclo
-    - lll
-    - dupl
-    - prealloc
-    - scopelint
-    - wsl
-    - nlreturn
-    - stylecheck
-    - testpackage
-    - paralleltest
-    - tparallel
-    - wrapcheck
-    - exhaustive
-    - exhaustruct
-    - makezero
-    - ifshort
-    - godot
-    - varnamelen
-    - nilnil
+  perfsprint:
+    err-error: true
+    errorf: true
+    sprintf1: true
+    strconcat: false
 
 issues:
   exclude-use-default: false
@@ -122,3 +115,6 @@ issues:
       text: 'G306:'
     - path: internal/generator.go
       text: 'mnd: Magic number: 0644, in <argument> detected'
+
+output:
+  show-stats: true
diff --git a/worktree/worktree.go b/worktree/worktree.go
@@ -9,7 +9,7 @@ func Add(path, branch string) func(*types.Cmd) {
 	return func(g *types.Cmd) {
 		g.AddOptions("add")
 		g.AddOptions(path)
-		if len(branch) > 0 {
+		if branch != "" {
 			g.AddOptions(branch)
 		}
 	}
@@ -50,7 +50,7 @@ func Force(g *types.Cmd) {
 func Branch(branch string) func(*types.Cmd) {
 	return func(g *types.Cmd) {
 		g.AddOptions("-b")
-		if len(branch) > 0 {
+		if branch != "" {
 			g.AddOptions(branch)
 		}
 	}
@@ -60,7 +60,7 @@ func Branch(branch string) func(*types.Cmd) {
 func BranchOverride(branch string) func(*types.Cmd) {
 	return func(g *types.Cmd) {
 		g.AddOptions("-B")
-		if len(branch) > 0 {
+		if branch != "" {
 			g.AddOptions(branch)
 		}
 	}
@@ -105,7 +105,7 @@ func Verbose(g *types.Cmd) {
 func Expire(time string) func(*types.Cmd) {
 	return func(g *types.Cmd) {
 		g.AddOptions("--expire")
-		if len(time) > 0 {
+		if time != "" {
 			g.AddOptions(time)
 		}
 	}
@@ -115,7 +115,7 @@ func Expire(time string) func(*types.Cmd) {
 func Reason(value string) func(*types.Cmd) {
 	return func(g *types.Cmd) {
 		g.AddOptions("--reason")
-		if len(value) > 0 {
+		if value != "" {
 			g.AddOptions(value)
 		}
 	}