From 111553c8ef0061fa96dec46f1c48d37e6d8e04be Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Thu, 8 Feb 2024 00:08:53 +0100
Subject: [PATCH] chore: Bump golangci-lint to v1.56.0

---
 .github/workflows/main.yml   | 2 +-
 .golangci.yml                | 6 ++++--
 internal/cmd/datacmd_test.go | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad47fdde1bd..dead2eb8432 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ env:
   FIND_TYPOS_VERSION: 0.0.3
   GO_VERSION: 1.22.0
   GOFUMPT_VERSION: 0.5.0
-  GOLANGCI_LINT_VERSION: 1.55.2
+  GOLANGCI_LINT_VERSION: 1.56.0
   GOLINES_VERSION: 0.11.0
   GOVERSIONINFO_VERSION: 1.4.0
   RAGE_VERSION: 0.9.2
diff --git a/.golangci.yml b/.golangci.yml
index 6f8ab0cd85a..7c6ea7de9fe 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,5 +1,5 @@
 run:
-  go: '1.19'
+  go: '1.21'
 
 linters:
   enable:
@@ -59,12 +59,15 @@ linters:
   - revive
   - rowserrcheck
   - sloglint
+  - spancheck
   - sqlclosecheck
   - staticcheck
   - stylecheck
+  - tagalign
   - tagliatelle
   - tenv
   - testableexamples
+  - testifylint
   - thelper
   - typecheck
   - unconvert
@@ -100,7 +103,6 @@ linters:
   - nlreturn
   - nonamedreturns
   - paralleltest
-  - tagalign
   - testpackage
   - tparallel
   - varnamelen
diff --git a/internal/cmd/datacmd_test.go b/internal/cmd/datacmd_test.go
index b0124cb4cc5..3bf620fc45d 100644
--- a/internal/cmd/datacmd_test.go
+++ b/internal/cmd/datacmd_test.go
@@ -54,7 +54,7 @@ func TestDataCmd(t *testing.T) {
 					Chezmoi struct {
 						SourceDir string `json:"sourceDir" yaml:"sourceDir"`
 					} `json:"chezmoi" yaml:"chezmoi"`
-					Test bool `json:"test" yaml:"test"`
+					Test bool `json:"test"    yaml:"test"`
 				}
 				assert.NoError(t, tc.format.Unmarshal([]byte(stdout.String()), &data))
 				normalizedSourceDir, err := chezmoi.NormalizePath("/tmp/source")