Skip to content

Commit f8b71cf

Browse files
twsltwsl
authored
Merge branch 'main' into fix/test-arg
2 parents 85a20eb + 55a0ba3 commit f8b71cf

File tree

4 files changed

+85
-82
lines changed

4 files changed

+85
-82
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ GO_SRC_FILES := $(shell find . -type f -name '*.go' -not -name '*_test.go')
55
GO_TEST_FILES := $(shell find . -type f -not -name '*.go' -name '*_test.go')
66
GOLDEN_FILES := $(shell find . -type f -name '*.golden')
77
SHELL_SRC_FILES := $(shell find . -type f -name '*.sh')
8-
GOLANGCI_LINT_VERSION := v1.59.1
8+
GOLANGCI_LINT_VERSION := v1.64.8
99

1010
fmt: $(shell find . -type f -name '*.go')
1111
go run mvdan.cc/[email protected] -l -w .

‎envbuilder.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro
194194
var cloned bool
195195
if opts.GitURL != "" {
196196
endStage := startStage("📦 Cloning %s to %s...",
197-
newColor(color.FgCyan).Sprintf(opts.GitURL),
198-
newColor(color.FgCyan).Sprintf(opts.WorkspaceFolder),
197+
newColor(color.FgCyan).Sprint(opts.GitURL),
198+
newColor(color.FgCyan).Sprint(opts.WorkspaceFolder),
199199
)
200200
stageNum := stageNumber
201201
logStage := func(format string, args ...any) {
@@ -237,8 +237,8 @@ func run(ctx context.Context, opts options.Options, execArgs *execArgsInfo) erro
237237
cloneOpts.Path = workingDir.Join("repo")
238238

239239
endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...",
240-
newColor(color.FgCyan).Sprintf(opts.GitURL),
241-
newColor(color.FgCyan).Sprintf(cloneOpts.Path),
240+
newColor(color.FgCyan).Sprint(opts.GitURL),
241+
newColor(color.FgCyan).Sprint(cloneOpts.Path),
242242
)
243243

244244
w := git.ProgressWriter(logStage)
@@ -1004,8 +1004,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
10041004
var cloned bool
10051005
if opts.GitURL != "" {
10061006
endStage := startStage("📦 Cloning %s to %s...",
1007-
newColor(color.FgCyan).Sprintf(opts.GitURL),
1008-
newColor(color.FgCyan).Sprintf(opts.WorkspaceFolder),
1007+
newColor(color.FgCyan).Sprint(opts.GitURL),
1008+
newColor(color.FgCyan).Sprint(opts.WorkspaceFolder),
10091009
)
10101010
stageNum := stageNumber
10111011
logStage := func(format string, args ...any) {
@@ -1045,8 +1045,8 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
10451045
cloneOpts.Path = workingDir.Join("repo")
10461046

10471047
endStage := startStage("📦 Remote repo build mode enabled, cloning %s to %s for build context...",
1048-
newColor(color.FgCyan).Sprintf(opts.GitURL),
1049-
newColor(color.FgCyan).Sprintf(cloneOpts.Path),
1048+
newColor(color.FgCyan).Sprint(opts.GitURL),
1049+
newColor(color.FgCyan).Sprint(cloneOpts.Path),
10501050
)
10511051

10521052
w := git.ProgressWriter(logStage)

‎go.mod‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/coder/envbuilder
22

3-
go 1.22.4
3+
go 1.24.6
44

55
// There are a few options we need added to Kaniko!
66
// See: https://github.com/GoogleContainerTools/kaniko/compare/main...coder:kaniko:main
7-
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20241120132148-131d6094d781
7+
replace github.com/GoogleContainerTools/kaniko => github.com/coder/kaniko v0.0.0-20251107135632-b20ff58093d8
88

99
// Required to import codersdk due to gvisor dependency.
1010
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa558fbe5374
@@ -36,17 +36,18 @@ require (
3636
github.com/prometheus/procfs v0.15.1
3737
github.com/sirupsen/logrus v1.9.3
3838
github.com/skeema/knownhosts v1.3.0
39-
github.com/stretchr/testify v1.10.0
39+
github.com/stretchr/testify v1.11.1
4040
github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a
4141
go.uber.org/mock v0.4.0
42-
golang.org/x/crypto v0.31.0
43-
golang.org/x/mod v0.21.0
44-
golang.org/x/sync v0.10.0
42+
golang.org/x/crypto v0.40.0
43+
golang.org/x/mod v0.26.0
44+
golang.org/x/sync v0.16.0
4545
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028
4646
)
4747

4848
require (
4949
cloud.google.com/go/compute/metadata v0.3.0 // indirect
50+
cyphar.com/go-pathrs v0.2.1 // indirect
5051
dario.cat/mergo v1.0.0 // indirect
5152
filippo.io/edwards25519 v1.1.0 // indirect
5253
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
@@ -105,18 +106,18 @@ require (
105106
github.com/coder/quartz v0.1.0 // indirect
106107
github.com/coder/terraform-provider-coder v0.23.0 // indirect
107108
github.com/containerd/cgroups v1.1.0 // indirect
108-
github.com/containerd/containerd v1.7.21 // indirect
109-
github.com/containerd/containerd/api v1.7.19 // indirect
110-
github.com/containerd/continuity v0.4.3 // indirect
111-
github.com/containerd/errdefs v0.1.0 // indirect
109+
github.com/containerd/containerd v1.7.29 // indirect
110+
github.com/containerd/containerd/api v1.8.0 // indirect
111+
github.com/containerd/continuity v0.4.4 // indirect
112+
github.com/containerd/errdefs v0.3.0 // indirect
112113
github.com/containerd/fifo v1.1.0 // indirect
113114
github.com/containerd/log v0.1.0 // indirect
114115
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
115-
github.com/containerd/ttrpc v1.2.5 // indirect
116+
github.com/containerd/ttrpc v1.2.7 // indirect
116117
github.com/containerd/typeurl/v2 v2.2.0 // indirect
117118
github.com/coreos/go-iptables v0.6.0 // indirect
118119
github.com/coreos/go-oidc/v3 v3.10.0 // indirect
119-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
120+
github.com/cyphar/filepath-securejoin v0.6.0 // indirect
120121
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
121122
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
122123
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
@@ -135,15 +136,15 @@ require (
135136
github.com/felixge/httpsnoop v1.0.4 // indirect
136137
github.com/frankban/quicktest v1.14.6 // indirect
137138
github.com/fxamacker/cbor/v2 v2.4.0 // indirect
138-
github.com/go-chi/chi/v5 v5.0.10 // indirect
139+
github.com/go-chi/chi/v5 v5.2.2 // indirect
139140
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
140-
github.com/go-jose/go-jose/v4 v4.0.1 // indirect
141-
github.com/go-logr/logr v1.4.1 // indirect
141+
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
142+
github.com/go-logr/logr v1.4.2 // indirect
142143
github.com/go-logr/stdr v1.2.2 // indirect
143144
github.com/go-ole/go-ole v1.2.6 // indirect
144145
github.com/godbus/dbus/v5 v5.1.0 // indirect
145146
github.com/gogo/protobuf v1.3.2 // indirect
146-
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
147+
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
147148
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
148149
github.com/golang/protobuf v1.5.4 // indirect
149150
github.com/google/btree v1.1.2 // indirect
@@ -212,7 +213,7 @@ require (
212213
github.com/opencontainers/go-digest v1.0.0 // indirect
213214
github.com/opencontainers/image-spec v1.1.0 // indirect
214215
github.com/opencontainers/runtime-spec v1.2.0 // indirect
215-
github.com/opencontainers/selinux v1.11.0 // indirect
216+
github.com/opencontainers/selinux v1.13.0 // indirect
216217
github.com/outcaste-io/ristretto v0.2.3 // indirect
217218
github.com/philhofer/fwd v1.1.2 // indirect
218219
github.com/pierrec/lz4/v4 v4.1.18 // indirect
@@ -271,21 +272,21 @@ require (
271272
go4.org/mem v0.0.0-20220726221520-4f986261bf13 // indirect
272273
go4.org/netipx v0.0.0-20230728180743-ad4cb58a6516 // indirect
273274
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
274-
golang.org/x/net v0.33.0 // indirect
275-
golang.org/x/oauth2 v0.20.0 // indirect
276-
golang.org/x/sys v0.28.0 // indirect
277-
golang.org/x/term v0.27.0 // indirect
278-
golang.org/x/text v0.21.0 // indirect
279-
golang.org/x/time v0.5.0 // indirect
280-
golang.org/x/tools v0.23.0 // indirect
275+
golang.org/x/net v0.42.0 // indirect
276+
golang.org/x/oauth2 v0.30.0 // indirect
277+
golang.org/x/sys v0.34.0 // indirect
278+
golang.org/x/term v0.33.0 // indirect
279+
golang.org/x/text v0.27.0 // indirect
280+
golang.org/x/time v0.12.0 // indirect
281+
golang.org/x/tools v0.34.0 // indirect
281282
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
282283
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
283284
google.golang.org/appengine v1.6.8 // indirect
284285
google.golang.org/genproto v0.0.0-20240401170217-c3f982113cda // indirect
285286
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8 // indirect
286287
google.golang.org/genproto/googleapis/rpc v0.0.0-20240521202816-d264139d666e // indirect
287288
google.golang.org/grpc v1.64.1 // indirect
288-
google.golang.org/protobuf v1.34.1 // indirect
289+
google.golang.org/protobuf v1.35.2 // indirect
289290
gopkg.in/DataDog/dd-trace-go.v1 v1.64.0 // indirect
290291
gopkg.in/warnings.v0 v0.1.2 // indirect
291292
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)