Skip to content
Merged
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
16 changes: 8 additions & 8 deletions envbuilder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
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 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
Expand Down