Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 1 addition & 3 deletions internal/manifestutil/manifestutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 0 additions & 2 deletions internal/setup/yaml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading