From 6e3858120587ed036f47857af61e6ab492658b9a Mon Sep 17 00:00:00 2001
From: Viacheslav Poturaev <vearutop@gmail.com>
Date: Fri, 21 Jun 2024 12:25:52 +0200
Subject: [PATCH 1/2] Update golangci-lint

---
 README.md                                    | 2 +-
 makefiles/base.mk                            | 2 +-
 scripts/lint.sh                              | 2 +-
 templates/github/workflows/golangci-lint.yml | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 6994b1f..e4eb570 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ import _ "github.com/bool64/dev" // Include development helpers to project.
 Add `Makefile` to your module with includes standard targets.
 
 ```Makefile
-#GOLANGCI_LINT_VERSION := "v1.56.2" # Optional configuration to pinpoint golangci-lint version.
+#GOLANGCI_LINT_VERSION := "v1.59.1" # Optional configuration to pinpoint golangci-lint version.
 
 # The head of Makefile determines location of dev-go to include standard targets.
 GO ?= go
diff --git a/makefiles/base.mk b/makefiles/base.mk
index 79a4626..e30e6c8 100644
--- a/makefiles/base.mk
+++ b/makefiles/base.mk
@@ -1,4 +1,4 @@
-#GOLANGCI_LINT_VERSION := "v1.56.2" # Optional configuration to pinpoint golangci-lint version.
+#GOLANGCI_LINT_VERSION := "v1.59.1" # Optional configuration to pinpoint golangci-lint version.
 
 # The head of Makefile determines location of dev-go to include standard targets.
 GO ?= go
diff --git a/scripts/lint.sh b/scripts/lint.sh
index d46b72c..65914d3 100755
--- a/scripts/lint.sh
+++ b/scripts/lint.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 [ -z "$GO" ] && GO=go
-[ -z "$GOLANGCI_LINT_VERSION" ] && GOLANGCI_LINT_VERSION="v1.56.2"
+[ -z "$GOLANGCI_LINT_VERSION" ] && GOLANGCI_LINT_VERSION="v1.59.1"
 
 # detecting GOPATH and removing trailing "/" if any
 GOPATH="$(go env GOPATH)"
diff --git a/templates/github/workflows/golangci-lint.yml b/templates/github/workflows/golangci-lint.yml
index 6239219..91340c1 100644
--- a/templates/github/workflows/golangci-lint.yml
+++ b/templates/github/workflows/golangci-lint.yml
@@ -24,10 +24,10 @@ jobs:
           go-version: 1.22.x
       - uses: actions/checkout@v2
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v4.0.0
+        uses: golangci/golangci-lint-action@v6.0.1
         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.56.2
+          version: v1.59.1
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

From f53eacd8ff971a989292040adf7f3537be2eef42 Mon Sep 17 00:00:00 2001
From: Viacheslav Poturaev <vearutop@gmail.com>
Date: Mon, 24 Jun 2024 17:31:24 +0200
Subject: [PATCH 2/2] Update golangci-lint

---
 scripts/.golangci.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/scripts/.golangci.yml b/scripts/.golangci.yml
index a035208..672106f 100644
--- a/scripts/.golangci.yml
+++ b/scripts/.golangci.yml
@@ -21,38 +21,33 @@ linters:
   enable-all: true
   disable:
     - lll
-    - maligned
     - gochecknoglobals
     - gomnd
     - wrapcheck
     - paralleltest
     - forbidigo
-    - exhaustivestruct
-    - interfacer # deprecated
     - forcetypeassert
-    - scopelint # deprecated
-    - ifshort # too many false positives
-    - golint # deprecated
     - varnamelen
     - tagliatelle
     - errname
     - ireturn
     - exhaustruct
     - nonamedreturns
-    - nosnakecase
     - structcheck
-    - varcheck
-    - deadcode
     - testableexamples
     - dupword
     - depguard
     - tagalign
+    - execinquery
+    - mnd
+    - testifylint
 
 issues:
   exclude-use-default: false
   exclude-rules:
     - linters:
         - gomnd
+        - mnd
         - goconst
         - goerr113
         - noctx