chore: update linter, and workflow

Author: ldez

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - main
   pull_request:
 
 jobs:
@@ -13,24 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v1.56.2
+      GOLANGCI_LINT_VERSION: v1.63.4
       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 }}
 
-
       - name: Check and get dependencies
         run: |
           go mod tidy

.github/workflows/go-cross.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - main
   pull_request:
 
 jobs:
@@ -20,14 +21,8 @@ jobs:
         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 }}
 

.golangci.yml

@@ -1,5 +1,28 @@
-run:
-  timeout: 2m
+linters:
+  enable-all: true
+  disable:
+    - exportloopref # deprecated
+    - cyclop # duplicate of gocyclo
+    - sqlclosecheck # not relevant (SQL)
+    - rowserrcheck # not relevant (SQL)
+    - dupl
+    - lll
+    - nestif
+    - mnd
+    - err113
+    - nlreturn
+    - wsl
+    - exhaustive
+    - exhaustruct
+    - tparallel
+    - testpackage
+    - paralleltest
+    - forcetypeassert
+    - varnamelen
+    - prealloc # false-positives
+    - nonamedreturns
+    - nilerr
+    - depguard
 
 linters-settings:
   govet:
@@ -23,44 +46,9 @@ linters-settings:
   godox:
     keywords:
       - FIXME
-
-linters:
-  enable-all: true
-  disable:
-    - deadcode # deprecated
-    - exhaustivestruct # deprecated
-    - golint # deprecated
-    - ifshort # deprecated
-    - interfacer # deprecated
-    - maligned # deprecated
-    - nosnakecase # deprecated
-    - scopelint # deprecated
-    - structcheck # deprecated
-    - varcheck # deprecated
-    - cyclop # duplicate of gocyclo
-    - sqlclosecheck # not relevant (SQL)
-    - rowserrcheck # not relevant (SQL)
-    - execinquery # not relevant (SQL)
-    - dupl
-    - lll
-    - nestif
-    - gomnd
-    - goerr113
-    - nlreturn
-    - wsl
-    - exhaustive
-    - exhaustruct
-    - tparallel
-    - testpackage
-    - paralleltest
-    - ifshort
-    - forcetypeassert
-    - varnamelen
-    - prealloc # false-positives
-    - nosnakecase
-    - nonamedreturns
-    - nilerr
-    - depguard
+  gosec:
+    excludes:
+      - G115 # integer overflow conversion
 
 issues:
   exclude-use-default: false
@@ -78,3 +66,6 @@ issues:
     - path: cmd/revgrep/main.go
       linters:
         - forbidigo
+
+run:
+  timeout: 2m