Skip to content

Commit

Permalink
feat: go v1.18 (#110)
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmidyson authored May 9, 2022
1 parent f081d79 commit f84ffa3
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
steps:
- uses: actions/setup-go@v3
with:
go-version: '1.17'
go-version: '1.18'
check-latest: true

- name: Check out code
Expand Down
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

run:
timeout: 3m
go: '1.17'

linters:
disable-all: true
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
golangci-lint 1.45.2
golangci-lint 1.46.0
goreleaser 1.8.3
golang 1.17.9 # FREEZE until golangci-lint fully supports go 1.18
golang 1.18.1
helm 3.8.1
pre-commit 2.19.0
upx 3.96
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module github.com/mesosphere/mindthegap

go 1.17
go 1.18

require (
github.com/aws/aws-sdk-go-v2/config v1.15.4
Expand Down
2 changes: 1 addition & 1 deletion skopeo-static/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

module github.com/mesosphere/mindthegap/skopeo-static

go 1.17
go 1.18

require github.com/containers/skopeo v1.8.0

Expand Down
9 changes: 5 additions & 4 deletions skopeo/skopeo.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,14 @@ func (r *Runner) CopyManifest(

mf, err := os.Create(filepath.Join(td, "manifest.json"))
if err != nil {
return nil, nil, fmt.Errorf("failed to create manifest.jsin file: %w", err)
return nil, nil, fmt.Errorf("failed to create manifest.json file: %w", err)
}
defer mf.Close()

// No need to check error - safe to enscode this type. See https://github.com/breml/errchkjson#safe
// for details
_ = json.NewEncoder(mf).Encode(manifest)
err = json.NewEncoder(mf).Encode(manifest)
if err != nil {
return nil, nil, fmt.Errorf("failed to JSON encode manifest: %w", err)
}

return r.Copy(
ctx,
Expand Down

0 comments on commit f84ffa3

Please sign in to comment.