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.

Sign up for GitHub

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

Jump to bottom

upgrade to golang 1.23 #1443

Merged
merged 3 commits into from
Sep 9, 2024
Merged

upgrade to golang 1.23 #1443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26fa32d
upgrade to golang 1.23
k4leung4 Aug 19, 2024
ab40f78
lint
k4leung4 Aug 19, 2024
67c7e74
install go
k4leung4 Aug 20, 2024
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
3 changes: 3 additions & 0 deletions .github/workflows/e2e.yaml
View file
Open in desktop
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
View file
Open in desktop
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
k4leung4 marked this conversation as resolved.
Show resolved Hide resolved
args: --timeout=5m

- run: |
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
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
View file
Open in desktop
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)
}
Loading