chore(deps,build,ci): bump Golang to v1.22

canonical · Jan 29, 2025 · c5b6df3 · c5b6df3
1 parent ad87b0b
commit c5b6df3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -26,4 +26,4 @@ jobs:
       - name: Check bugs and unused code
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54.1
+          version: v1.63.4
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/canonical/chisel
 
-go 1.21
+go 1.22
 
 require (
 	github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb

diff --git a/internal/manifestutil/manifestutil.go b/internal/manifestutil/manifestutil.go
@@ -176,9 +176,7 @@ func fastValidate(options *WriteOptions) (err error) {
 			}
 		}
 		if entry.Inode != 0 {
-			// TODO remove the following line after upgrading to Go 1.22 or higher.
-			e := entry
-			hardLinkGroups[e.Inode] = append(hardLinkGroups[e.Inode], &e)
+			hardLinkGroups[entry.Inode] = append(hardLinkGroups[entry.Inode], &entry)
 		}
 	}
 	// Entries within a hard link group must have same content.

diff --git a/internal/setup/yaml.go b/internal/setup/yaml.go
@@ -506,8 +506,6 @@ func sliceToYAML(s *Slice) (*yamlSlice, error) {
 		slice.Essential = append(slice.Essential, key.String())
 	}
 	for path, info := range s.Contents {
-		// TODO remove the following line after upgrading to Go 1.22 or higher.
-		info := info
 		yamlPath, err := pathInfoToYAML(&info)
 		if err != nil {
 			return nil, err

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -29,7 +29,7 @@ parts:
     plugin: go
     source: .
     build-snaps:
-      - go/1.21/stable
+      - go/1.22/stable
     build-environment:
       - CGO_ENABLED: 0
       - GOFLAGS: -trimpath -ldflags=-w -ldflags=-s