MAJOR: update to go 1.26

Author: oktalz

.aspell.yml

@@ -39,3 +39,31 @@ allowed:
   - junit
   - deps
   - alternative
+  - awk
+  - betteralign
+  - cmd
+  - cmds
+  - cyclomatic
+  - desc
+  - dotenv
+  - eval
+  - fmt
+  - formatter
+  - gobin
+  - gofumpt
+  - gotestsum
+  - govulncheck
+  - hivis
+  - linters
+  - Printf
+  - Println
+  - staticcheck
+  - struct
+  - structs
+  - taskfile
+  - testdox
+  - tmp
+  - toml
+  - unexported
+  - unhandled
+  - yml

.github/workflows/actions.yaml

@@ -11,8 +11,12 @@ jobs:
         with:
           go-version-file: 'go.mod'
           check-latest: true
-      - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          version: 3.x
+      - name: lint
+        run: task lint
   go_build:
     name: Go build
     runs-on: ubuntu-latest

.golangci.yml

@@ -6,7 +6,6 @@ import (
 	"log"
 	"os/exec"
 	"slices"
-	"sort"
 	"strings"
 
 	"github.com/haproxytech/check-commit/v5/junit"
@@ -24,12 +23,12 @@ type RemoteFile struct {
 }
 
 type Aspell struct {
-	Mode         mode       `yaml:"mode"`
 	RemoteFile   RemoteFile `yaml:"remote_file"`
-	MinLength    int        `yaml:"min_length"`
+	Mode         mode       `yaml:"mode"`
+	HelpText     string     `yaml:"-"`
 	IgnoreFiles  []string   `yaml:"ignore_files"`
 	AllowedWords []string   `yaml:"allowed"`
-	HelpText     string     `yaml:"-"`
+	MinLength    int        `yaml:"min_length"`
 }
 
 var (
@@ -116,7 +115,7 @@ func (a Aspell) checkSingle(data string, allowedWords []string) error {
 		for k := range m {
 			badWords = append(badWords, k)
 		}
-		sort.Strings(badWords)
+		slices.Sort(badWords)
 		return fmt.Errorf("aspell: %s", badWords)
 	}
 	return nil
@@ -126,8 +125,8 @@ func (a Aspell) Check(subjects []string, commitsFull []string, content []map[str
 	var commitsFullData []string
 	for _, c := range commitsFull {
 		commit := []string{}
-		lines := strings.Split(c, "\n")
-		for _, l := range lines {
+		lines := strings.SplitSeq(c, "\n")
+		for l := range lines {
 			c2 := strings.TrimSpace(l)
 			if strings.HasPrefix(c2, "Signed-off-by:") ||
 				strings.HasPrefix(c2, "Reviewed-by:") ||
@@ -144,7 +143,7 @@ func (a Aspell) Check(subjects []string, commitsFull []string, content []map[str
 		commitsFullData = append(commitsFullData, strings.Join(commit, "\n"))
 	}
 
-	var response string
+	var response strings.Builder
 	var checks []string
 	switch a.Mode {
 	case modeDisabled:
@@ -174,25 +173,23 @@ func (a Aspell) Check(subjects []string, commitsFull []string, content []map[str
 				if err := a.checkSingle(v, imports); err != nil {
 					junitSuite.AddMessageFailed(name, "aspell check failed", err.Error())
 					log.Println(name, err.Error())
-					response += fmt.Sprintf("%s\n", err)
+					response.WriteString(fmt.Sprintf("%s\n", err))
 				}
 			}
 		}
 		checks = commitsFullData
-	default:
-		checks = subjects
 	}
 
 	for _, subject := range checks {
 		if err := a.checkSingle(subject, []string{}); err != nil {
 			junitSuite.AddMessageFailed("commit message", "aspell check failed", err.Error())
 			log.Println("commit message", err.Error())
-			response += fmt.Sprintf("%s\n", err)
+			response.WriteString(fmt.Sprintf("%s\n", err))
 		}
 	}
 
-	if len(response) > 0 {
-		return fmt.Errorf("%s", response)
+	if len(response.String()) > 0 {
+		return fmt.Errorf("%s", response.String())
 	}
 	return nil
 }

aspell/aspell.go

@@ -32,7 +32,7 @@ func New(filename string) (Aspell, error) {
 			return Aspell{}, err
 		}
 		if len(extraAllowedWords) == 0 {
-			log.Printf("warning: aspell remote file is empty")
+			log.Print("warning: aspell remote file is empty")
 		}
 	}
 
@@ -48,10 +48,7 @@ func New(filename string) (Aspell, error) {
 	}
 
 	switch aspell.Mode {
-	case modeDisabled:
-	case modeSubject:
-	case modeCommit:
-	case modeAll:
+	case modeDisabled, modeSubject, modeCommit, modeAll:
 	case "":
 		aspell.Mode = modeSubject
 	default:

aspell/new.go

@@ -2,6 +2,7 @@ package aspell
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"net/http"
@@ -21,7 +22,7 @@ func fetchRemoteFile(aspell Aspell) ([]string, error) {
 	}
 
 	if url == "" {
-		return nil, fmt.Errorf("aspell remote file: URL is empty")
+		return nil, errors.New("aspell remote file: URL is empty")
 	}
 
 	req, err := http.NewRequest("GET", url, nil)
@@ -55,15 +56,15 @@ func fetchRemoteFile(aspell Aspell) ([]string, error) {
 		return nil, fmt.Errorf("error fetching remote file: %s", resp.Status)
 	}
 
-	var data map[string]interface{}
+	var data map[string]any
 	err = json.NewDecoder(resp.Body).Decode(&data)
 	if err != nil {
 		return nil, fmt.Errorf("aspell remote file: failed to decode JSON: %w", err)
 	}
 
 	var allowedWords []string
 
-	items, ok := data[aspell.RemoteFile.AllowedItemsKey].([]interface{})
+	items, ok := data[aspell.RemoteFile.AllowedItemsKey].([]any)
 	if !ok {
 		content, ok := data[aspell.RemoteFile.AllowedItemsKey].(string)
 		if !ok {

aspell/remote.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"log"
 	"os"
+	"strings"
 	"testing"
 
 	"github.com/haproxytech/check-commit/v5/aspell"
@@ -13,7 +14,7 @@ import (
 func Test_Aspell(t *testing.T) {
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
-	aspell, err := aspell.New(".aspell.yml")
+	aspellCheck, err := aspell.New(".aspell.yml")
 	if err != nil {
 		t.Errorf("checkWithAspell() error = %v", err)
 	}
@@ -27,15 +28,15 @@ func Test_Aspell(t *testing.T) {
 	defer readmeFile.Close()
 
 	scanner := bufio.NewScanner(readmeFile)
-	readme := ""
+	var readme strings.Builder
 	for scanner.Scan() {
-		readme += scanner.Text() + "\n"
+		readme.WriteString(scanner.Text() + "\n")
 	}
 	if err := scanner.Err(); err != nil {
 		t.Errorf("could not read "+filename+" file: %v", err)
 	}
-	err = aspell.Check([]string{"subject"}, []string{"body"}, []map[string]string{
-		{filename: readme},
+	err = aspellCheck.Check([]string{"subject"}, []string{"body"}, []map[string]string{
+		{filename: readme.String()},
 	}, &junit.JunitSuiteDummy{})
 	if err != nil {
 		t.Errorf("checkWithAspell() error = %v", err)