Merge pull request #13 from gripmock/golangci-v2

Golangci v2

Author: rez1dent3

.github/workflows/golangci-lint.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.22' ]
+        go-version: [ '1.24' ]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go
@@ -21,6 +21,6 @@ jobs:
           go-version: ${{ matrix.go-version }}
           cache: true
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.59.1
+          version: v2.0.2

.github/workflows/unit.yml

@@ -1,21 +1,28 @@
 name: Unit
 on:
   pull_request:
+    branches:
+      - master
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.22', '1.23' ]
+        go-version: [ '1.24' ]
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v4
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
           cache: true
+      - name: Install dependencies
+        run: go get .
       - name: Test with Go
-        run: go test ./...
+        run: go test -json ./... 2>&1 | tee -a TestResults-${{ matrix.go-version }}.json
+      - name: Upload Go test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: Go-results-${{ matrix.go-version }}
+          path: TestResults-${{ matrix.go-version }}.json

.golangci.yml

@@ -1,33 +1,54 @@
-run:
-  go: "1.22"
-  timeout: 1m
+version: "2"
 linters:
-  enable-all: true
+  default: all
   disable:
-    # deprecated
-    - execinquery
-    - gomnd
-    # not relevant
-    - wrapcheck
-    - paralleltest
     - exhaustruct
+    - godox
+    - paralleltest
+    - varnamelen
+    - wrapcheck
     - tagalign
-linters-settings:
-  lll:
-    line-length: 140
-  gci:
-    sections:
-      - Standard
-      - Default
-      - Prefix(github.com/gripmock)
-  depguard:
+  settings:
+    depguard:
+      rules:
+        main:
+          allow:
+            - $gostd
+            - github.com
+            - golang.org
+            - google.golang.org
+    lll:
+      line-length: 140
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
     rules:
-      main:
-        allow:
-          - $gostd
-          - github.com
-issues:
-  exclude-rules:
-    - path: (.+)_test.go
-      linters:
-        - dupl
+      - linters:
+          - dupl
+        path: (.+)_test.go
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+  settings:
+    gci:
+      sections:
+        - Standard
+        - Default
+        - Prefix(github.com/gripmock)
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Makefile

@@ -4,7 +4,7 @@ test:
 	go test -tags mock -race -cover ./...
 
 lint:
-	go run github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1 run --color always ${args}
+	go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2 run --color always ${args}
 
 lint-fix:
 	make lint args=--fix

env.go

@@ -3,7 +3,7 @@ package environment
 import (
 	"time"
 
-	env "github.com/caarlos0/env/v10"
+	env "github.com/caarlos0/env/v11"
 )
 
 type watcherType string

env_test.go

@@ -1,7 +1,6 @@
 package environment_test
 
 import (
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -43,8 +42,7 @@ func TestConfig_Override(t *testing.T) {
 	}
 
 	for k, v := range env {
-		err := os.Setenv(k, v)
-		require.NoError(t, err)
+		t.Setenv(k, v)
 	}
 
 	conf, err := environment.New()

go.mod

@@ -1,9 +1,9 @@
 module github.com/gripmock/environment
 
-go 1.22.1
+go 1.24
 
 require (
-	github.com/caarlos0/env/v10 v10.0.0
+	github.com/caarlos0/env/v11 v11.3.1
 	github.com/stretchr/testify v1.10.0
 )
 

go.sum

@@ -1,5 +1,7 @@
 github.com/caarlos0/env/v10 v10.0.0 h1:yIHUBZGsyqCnpTkbjk8asUlx6RFhhEs+h7TOBdgdzXA=
 github.com/caarlos0/env/v10 v10.0.0/go.mod h1:ZfulV76NvVPw3tm591U4SwL3Xx9ldzBP9aGxzeN7G18=
+github.com/caarlos0/env/v11 v11.3.1 h1:cArPWC15hWmEt+gWk7YBi7lEXTXCvpaSdCiZE2X5mCA=
+github.com/caarlos0/env/v11 v11.3.1/go.mod h1:qupehSf/Y0TUTsxKywqRt/vJjN5nz6vauiYEUUr8P4U=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=