golangci-lint 2.0 fixes

Author: cardil

.github/workflows/lint.yaml

@@ -24,9 +24,9 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22'
+          go-version: '1.24'
           cache: false
-      - uses: golangci/golangci-lint-action@v4
+      - uses: golangci/golangci-lint-action@v7
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
           version: v2.0.2

.github/workflows/mage.yaml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         go-version:
-          - '1.22'
+          - '1.24'
     steps:
 
       - name: Set up Go ${{ matrix.go-version }}

.golangci.yaml

@@ -16,6 +16,7 @@ linters:
     - paralleltest
     - varnamelen
     - wsl
+    - nonamedreturns
   settings:
     wrapcheck:
       ignore-package-globs:

pkg/config/defaults.go

@@ -37,7 +37,7 @@ func newDefaults(project Project) Config {
 			RefSpec: "v*",
 		},
 		ResyncReleases: ResyncReleases{
-			NumberOf: 6, //nolint:mnd,gomnd
+			NumberOf: 6, //nolint:mnd
 		},
 		Messages: Messages{
 			TriggerCI: ":robot: Synchronize branch `%s` to " +

pkg/errors/wrap.go

@@ -25,3 +25,9 @@ func Is(err, target error) bool {
 func New(text string) error {
 	return errors.New(text) //nolint:err113
 }
+
+// Join returns an error that wraps the given errors.
+// Any nil error values are discarded.
+func Join(err ...error) error {
+	return errors.Join(err...)
+}

pkg/git/checkout_test.go

@@ -1,7 +1,6 @@
 package git_test
 
 import (
-	"context"
 	"slices"
 	"testing"
 
@@ -45,7 +44,7 @@ func TestCheckout_OntoWorkspace(t *testing.T) {
 		Branch: plumbing.NewBranchReferenceName("target"),
 	}))
 	repo := &git.Repository{
-		Context: context.TODO(),
+		Context: t.Context(),
 		Project: config.Project{
 			Path: projectPath,
 		},

pkg/github/client.go

@@ -27,19 +27,24 @@ type Client struct {
 }
 
 // Execute a Github client CLI command.
-func (c Client) Execute(ctx context.Context) ([]byte, error) {
+func (c Client) Execute(ctx context.Context) (bytes []byte, err error) {
 	buildVersion := metadata.Version
 	cmdFactory := factory.New(buildVersion)
-	cmd, err := ghroot.NewCmdRoot(cmdFactory, buildVersion, "-")
-	if err != nil {
-		return nil, errors.Wrap(err, ErrClientFailed)
+	cmd, gerr := ghroot.NewCmdRoot(cmdFactory, buildVersion, "-")
+	if gerr != nil {
+		err = errors.Join(err, errors.Wrap(gerr, ErrClientFailed))
+		return bytes, err
 	}
 	cmd.SetArgs(c.Args)
 	tmpf, terr := os.CreateTemp("", "gh-")
 	if terr != nil {
-		return nil, errors.Wrap(terr, ErrClientFailed)
+		err = errors.Join(err, errors.Wrap(terr, ErrClientFailed))
+		return bytes, err
 	}
-	defer os.Remove(tmpf.Name())
+	defer func() {
+		rmerr := os.Remove(tmpf.Name())
+		err = errors.Join(err, errors.Wrap(rmerr, ErrClientFailed))
+	}()
 	cmdFactory.IOStreams.Out = tmpf
 	cmdFactory.IOStreams.ErrOut = os.Stderr
 	if c.DisableColor {
@@ -55,10 +60,10 @@ func (c Client) Execute(ctx context.Context) ([]byte, error) {
 				ErrClientFailed)
 		}
 	}
-	err = runner()
+	err = errors.Join(err, runner())
 	bytes, ferr := os.ReadFile(tmpf.Name())
 	if ferr != nil {
-		return nil, errors.Wrap(ferr, ErrClientFailed)
+		err = errors.Join(err, errors.Wrap(ferr, ErrClientFailed))
 	}
-	return bytes, errors.Wrap(err, ErrClientFailed)
+	return bytes, err
 }