From ba5500fcee104a24ad24b0df576333288c6d7c88 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Thu, 6 Nov 2025 17:37:40 +0000 Subject: [PATCH] chore: update Go to 1.24.6 --- Makefile | 2 +- envbuilder.go | 16 ++++++++-------- go.mod | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 14ed5182..6b71dae6 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ GO_SRC_FILES := $(shell find . -type f -name '*.go' -not -name '*_test.go') GO_TEST_FILES := $(shell find . -type f -not -name '*.go' -name '*_test.go') GOLDEN_FILES := $(shell find . -type f -name '*.golden') SHELL_SRC_FILES := $(shell find . -type f -name '*.sh') -GOLANGCI_LINT_VERSION := v1.59.1 +GOLANGCI_LINT_VERSION := v1.64.8 fmt: $(shell find . -type f -name '*.go') go run mvdan.cc/gofumpt@v0.6.0 -l -w . diff --git a/envbuilder.go b/envbuilder.go index ad2c84ff..34adb9c1 100644 --- a/envbuilder.go +++ b/envbuilder.go @@ -194,8 +194,8 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro var cloned bool if opts.GitURL != "" { endStage := startStage("📦 Cloning %s to %s...", - newColor(color.FgCyan).Sprintf(opts.GitURL), - newColor(color.FgCyan).Sprintf(opts.WorkspaceFolder), + newColor(color.FgCyan).Sprint(opts.GitURL), + newColor(color.FgCyan).Sprint(opts.WorkspaceFolder), ) stageNum := stageNumber logStage := func(format string, args ...any) { @@ -237,8 +237,8 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro cloneOpts.Path = workingDir.Join("repo") endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...", - newColor(color.FgCyan).Sprintf(opts.GitURL), - newColor(color.FgCyan).Sprintf(cloneOpts.Path), + newColor(color.FgCyan).Sprint(opts.GitURL), + newColor(color.FgCyan).Sprint(cloneOpts.Path), ) w := git.ProgressWriter(logStage) @@ -1004,8 +1004,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error) var cloned bool if opts.GitURL != "" { endStage := startStage("📦 Cloning %s to %s...", - newColor(color.FgCyan).Sprintf(opts.GitURL), - newColor(color.FgCyan).Sprintf(opts.WorkspaceFolder), + newColor(color.FgCyan).Sprint(opts.GitURL), + newColor(color.FgCyan).Sprint(opts.WorkspaceFolder), ) stageNum := stageNumber logStage := func(format string, args ...any) { @@ -1045,8 +1045,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error) cloneOpts.Path = workingDir.Join("repo") endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...", - newColor(color.FgCyan).Sprintf(opts.GitURL), - newColor(color.FgCyan).Sprintf(cloneOpts.Path), + newColor(color.FgCyan).Sprint(opts.GitURL), + newColor(color.FgCyan).Sprint(cloneOpts.Path), ) w := git.ProgressWriter(logStage) diff --git a/go.mod b/go.mod index fdd498f6..5d0ce736 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/coder/envbuilder -go 1.22.4 +go 1.24.6 // There are a few options we need added to Kaniko! // See: https://github.com/GoogleContainerTools/kaniko/compare/main...coder:kaniko:main