Merge pull request #236 from kolyshkin/modernize-ci

rhatdan · web-flow · commit f2424d8145e2 · 2025-10-08T01:50:49.000-04:00
Add Go 1.25, drop go 1.23, bump golangci-lint
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -33,10 +33,10 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v6
         with:
-          go-version: 1.24.x
-      - uses: golangci/golangci-lint-action@v7
+          go-version: 1.25.x
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.0
+          version: v2.5
 
   codespell:
     runs-on: ubuntu-24.04
@@ -61,18 +61,18 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v6
         with:
-          go-version: 1.24.x
-      - uses: golangci/golangci-lint-action@v7
+          go-version: 1.25.x
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v2.0
+          version: v2.5
       - name: test-stubs
         run: make test
 
   test:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.19.x, 1.23.x, 1.24.x]
+        go-version: [1.19.x, 1.24.x, 1.25.x]
         race: ["-race", ""]
     runs-on: ubuntu-24.04
     steps:
diff --git a/pkg/pwalk/pwalk_test.go b/pkg/pwalk/pwalk_test.go
@@ -97,7 +97,7 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err
 		var dir string
 		dir, err = os.MkdirTemp(prefix, "d-")
 		if err != nil {
-			return
+			return count, err
 		}
 		count++
 		for f := 0; f < files; f++ {
@@ -114,12 +114,12 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err
 		}
 		var c uint32
 		if c, err = makeManyDirs(dir, levels-1, dirs, files); err != nil {
-			return
+			return count, err
 		}
 		count += c
 	}
 
-	return
+	return count, err
 }
 
 // prepareTestSet() creates a directory tree of shallow files,
diff --git a/pkg/pwalkdir/pwalkdir_test.go b/pkg/pwalkdir/pwalkdir_test.go
@@ -100,7 +100,7 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err
 		var dir string
 		dir, err = os.MkdirTemp(prefix, "d-")
 		if err != nil {
-			return
+			return count, err
 		}
 		count++
 		for f := 0; f < files; f++ {
@@ -117,12 +117,12 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err
 		}
 		var c uint32
 		if c, err = makeManyDirs(dir, levels-1, dirs, files); err != nil {
-			return
+			return count, err
 		}
 		count += c
 	}
 
-	return
+	return count, err
 }
 
 // prepareTestSet() creates a directory tree of shallow files,

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err`
`97`	`97`	`var dir string`
`98`	`98`	`dir, err = os.MkdirTemp(prefix, "d-")`
`99`	`99`	`if err != nil {`
`100`		`- return`
	`100`	`+ return count, err`
`101`	`101`	`}`
`102`	`102`	`count++`
`103`	`103`	`for f := 0; f < files; f++ {`
`@@ -114,12 +114,12 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err`
`114`	`114`	`}`
`115`	`115`	`var c uint32`
`116`	`116`	`if c, err = makeManyDirs(dir, levels-1, dirs, files); err != nil {`
`117`		`- return`
	`117`	`+ return count, err`
`118`	`118`	`}`
`119`	`119`	`count += c`
`120`	`120`	`}`
`121`	`121`
`122`		`- return`
	`122`	`+ return count, err`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// prepareTestSet() creates a directory tree of shallow files,`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err`
`100`	`100`	`var dir string`
`101`	`101`	`dir, err = os.MkdirTemp(prefix, "d-")`
`102`	`102`	`if err != nil {`
`103`		`- return`
	`103`	`+ return count, err`
`104`	`104`	`}`
`105`	`105`	`count++`
`106`	`106`	`for f := 0; f < files; f++ {`
`@@ -117,12 +117,12 @@ func makeManyDirs(prefix string, levels, dirs, files int) (count uint32, err err`
`117`	`117`	`}`
`118`	`118`	`var c uint32`
`119`	`119`	`if c, err = makeManyDirs(dir, levels-1, dirs, files); err != nil {`
`120`		`- return`
	`120`	`+ return count, err`
`121`	`121`	`}`
`122`	`122`	`count += c`
`123`	`123`	`}`
`124`	`124`
`125`		`- return`
	`125`	`+ return count, err`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// prepareTestSet() creates a directory tree of shallow files,`