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

go: move to 1.23 #1457

Closed
wants to merge 1 commit into from
Closed
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ GOLANGCI_LINT_BIN = $(GOLANGCI_LINT_DIR)/golangci-lint
setup-golangci-lint:
rm -f $(GOLANGCI_LINT_BIN) || :
set -e ;
GOBIN=$(GOLANGCI_LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.0;
GOBIN=$(GOLANGCI_LINT_DIR) go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.3;

.PHONY: fmt
fmt: ## Format all go files
Expand All @@ -143,7 +143,7 @@ log-%:

.PHONY: lint
lint: checkfmt setup-golangci-lint ## Run linters and checks like golangci-lint
$(GOLANGCI_LINT_BIN) run --verbose --concurrency 4 --skip-dirs .modcache ./...
$(GOLANGCI_LINT_BIN) run --verbose --concurrency 4 --exclude-dirs .modcache ./...

.PHONY: test
test:
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.Warnf("%s", 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.Warnf("%s", err.Error())
}
return lintPackageFS(ctx, pkgname, exp.TarFS, require)
}
Loading