Skip to content

Commit

Permalink
Merge pull request #1443 from k4leung4/go123
Browse files Browse the repository at this point in the history
upgrade to golang 1.23
  • Loading branch information
cpanato authored Sep 9, 2024
2 parents 64a77dd + 67c7e74 commit f2e798e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ jobs:
egress-policy: audit

- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
with:
go-version-file: "go.mod"
- name: Mark workspace as a safe repository
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}
- name: Build bootstrap melange tool (stage1)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v3.1.0
with:
version: v1.59
version: v1.60
args: --timeout=5m

- run: |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module chainguard.dev/melange

go 1.22.5
go 1.23.0

require (
al.essio.dev/pkg/shellescape v1.5.0
Expand Down
4 changes: 2 additions & 2 deletions pkg/linter/linter.go
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func LintBuild(ctx context.Context, packageName string, path string, require, wa
fsys := os.DirFS(path)

if err := lintPackageFS(ctx, packageName, fsys, warn); err != nil {
log.Warnf(err.Error())
log.Warn(err.Error())
}
log.Infof("linting apk: %s", packageName)
return lintPackageFS(ctx, packageName, fsys, require)
Expand Down Expand Up @@ -643,7 +643,7 @@ func LintAPK(ctx context.Context, path string, require, warn []string) error {

log.Infof("linting apk: %s (size: %s)", pkgname, humanize.Bytes(uint64(exp.Size)))
if err := lintPackageFS(ctx, pkgname, exp.TarFS, warn); err != nil {
log.Warnf(err.Error())
log.Warn(err.Error())
}
return lintPackageFS(ctx, pkgname, exp.TarFS, require)
}

0 comments on commit f2e798e

Please sign in to comment.