Merge pull request #209 from austinvazquez/update-go-matrix-in-ci

rhatdan · web-flow · commit 76d8f982df81 · 2024-02-12T10:49:14.000-05:00
Update GitHub Actions CI Go matrix for Go v1.22
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -33,11 +33,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
           cache: false # golangci-lint-action does its own caching
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54
+          version: v1.56
 
   codespell:
     runs-on: ubuntu-22.04
@@ -62,19 +62,19 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
           cache: false # golangci-lint-action does its own caching
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54
+          version: v1.56
       - name: test-stubs
         run: make test
 
   test:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.19.x, 1.20.x, 1.21.x]
+        go-version: [1.21.x, 1.22.x]
         race: ["-race", ""]
     runs-on: ubuntu-20.04
     steps:
diff --git a/pkg/pwalk/pwalk_test.go b/pkg/pwalk/pwalk_test.go
@@ -73,7 +73,7 @@ func TestWalkDirManyErrors(t *testing.T) {
 	max := uint32(total / 2)
 	e42 := errors.New("42")
 	err := Walk(dir,
-		func(p string, i os.FileInfo, _ error) error {
+		func(_ string, _ os.FileInfo, _ error) error {
 			if atomic.AddUint32(&count, 1) > max {
 				return e42
 			}
diff --git a/pkg/pwalkdir/pwalkdir_test.go b/pkg/pwalkdir/pwalkdir_test.go
@@ -76,7 +76,7 @@ func TestWalkDirManyErrors(t *testing.T) {
 	max := uint32(total / 2)
 	e42 := errors.New("42")
 	err := Walk(dir,
-		func(p string, e fs.DirEntry, _ error) error {
+		func(_ string, _ fs.DirEntry, _ error) error {
 			if atomic.AddUint32(&count, 1) > max {
 				return e42
 			}

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ func TestWalkDirManyErrors(t *testing.T) {`
`73`	`73`	`max := uint32(total / 2)`
`74`	`74`	`e42 := errors.New("42")`
`75`	`75`	`err := Walk(dir,`
`76`		`- func(p string, i os.FileInfo, _ error) error {`
	`76`	`+ func(_ string, _ os.FileInfo, _ error) error {`
`77`	`77`	`if atomic.AddUint32(&count, 1) > max {`
`78`	`78`	`return e42`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func TestWalkDirManyErrors(t *testing.T) {`
`76`	`76`	`max := uint32(total / 2)`
`77`	`77`	`e42 := errors.New("42")`
`78`	`78`	`err := Walk(dir,`
`79`		`- func(p string, e fs.DirEntry, _ error) error {`
	`79`	`+ func(_ string, _ fs.DirEntry, _ error) error {`
`80`	`80`	`if atomic.AddUint32(&count, 1) > max {`
`81`	`81`	`return e42`
`82`	`82`	`}`