ci: Update golangci-lint to v1.61

.github/workflows/golangci-lint.yml

@@ -26,4 +26,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.54
+          version: v1.61

.golangci.yaml

@@ -5,16 +5,17 @@ linters:
     # Disabled to get codebase to pass the linter.
     # We can enable these one at a time.
     - cyclop
+    - err113
     - errcheck
     - funlen
     - gochecknoglobals
     - gochecknoinits
-    - goerr113
-    - gomnd
     - gosec
     - lll
+    - mnd
     - nestif
     - noctx
+    - perfsprint
     - revive
     - stylecheck
     - wrapcheck
@@ -26,17 +27,9 @@ linters:
     - depguard        # manage using go.mod for now
     - nonamedreturns  # named returns are acceptable in short functions
     # Deprecated
-    - exhaustivestruct
-    - scopelint
-    - interfacer
-    - maligned
-    - golint
-    - structcheck
-    - varcheck
-    - deadcode
-    - nosnakecase
-    - ifshort
-
+    - execinquery
+    - exportloopref
+    - gomnd
 severity:
   default-severity: major
 

builder/history.go

@@ -302,15 +302,15 @@ type YPKG struct {
 type YPKGUpdate struct {
 	Release int    `xml:"release,attr"`
 	Type    string `xml:"type,attr,omitempty"`
-	Date    string
-	Version string
+	Date    string `xml:"Date"`
+	Version string `xml:"Version"`
 	Comment struct {
 		Value string `xml:",cdata"`
-	}
+	} `xml:"Comment"`
 	Name struct {
 		Value string `xml:",cdata"`
-	}
-	Email string
+	} `xml:"Name"`
+	Email string `xml:"Email"`
 }
 
 // WriteXML will attempt to dump the update history to an XML file

builder/manager.go

@@ -105,7 +105,7 @@ func NewManager() (*Manager, error) {
 	if config, err := NewConfig(); err == nil {
 		man.Config = config
 	} else {
-		slog.Error("Failed to load solbuild configuration %s\n", err)
+		slog.Error("Failed to load solbuild configuration", "err", err)
 		return nil, err
 	}
 

builder/mmap.go

@@ -50,8 +50,8 @@ func MapFile(path string) (*MmapFile, error) {
 	}
 
 	ret.len = st.Size()
-	ret.Data, err = syscall.Mmap(int(ret.f.Fd()), 0, int(ret.len), syscall.PROT_READ, syscall.MAP_PRIVATE)
 
+	ret.Data, err = syscall.Mmap(int(ret.f.Fd()), 0, int(ret.len), syscall.PROT_READ, syscall.MAP_PRIVATE)
 	if err != nil {
 		ret.f.Close()
 		return nil, err

builder/pkg.go

@@ -79,12 +79,12 @@ type YmlPackage struct {
 
 // XMLUpdate represents an update in the package history.
 type XMLUpdate struct {
-	Release int `xml:"release,attr"`
-	Date    string
-	Version string
-	Comment string
-	Name    string
-	Email   string
+	Release int    `xml:"release,attr"`
+	Date    string `xml:"Date"`
+	Version string `xml:"Version"`
+	Comment string `xml:"Comment"`
+	Name    string `xml:"Name"`
+	Email   string `xml:"Email"`
 }
 
 // XMLArchive is an <Archive> line in Source section.

builder/util.go

@@ -45,7 +45,7 @@ func init() {
 
 // PidNotifier provides a simple way to set the PID on a blocking process.
 type PidNotifier interface {
-	SetActivePID(int)
+	SetActivePID(pid int)
 }
 
 // ActivateRoot will do the hard work of actually bring up the overlayfs