From d60191ba28c31c6a4e7246f310befa49b40f7194 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 2 Oct 2024 12:39:14 +0300 Subject: [PATCH 1/2] chore(go.mod): update github.com/coder/envbuilder to v1.0.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 16b47b4..0473867 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20240702054557-aa55 require ( github.com/GoogleContainerTools/kaniko v1.9.2 - github.com/coder/envbuilder v1.0.0-rc.0.0.20240927195324-5c150b3c1e35 + github.com/coder/envbuilder v1.0.2 github.com/coder/serpent v0.8.0 github.com/docker/docker v26.1.5+incompatible github.com/gliderlabs/ssh v0.3.7 diff --git a/go.sum b/go.sum index 71badbc..ac631c7 100644 --- a/go.sum +++ b/go.sum @@ -186,8 +186,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/coder/coder/v2 v2.10.1-0.20240704130443-c2d44d16a352 h1:L/EjCuZxs5tOcqqCaASj/nu65TRYEFcTt8qRQfHZXX0= github.com/coder/coder/v2 v2.10.1-0.20240704130443-c2d44d16a352/go.mod h1:P1KoQSgnKEAG6Mnd3YlGzAophty+yKA9VV48LpfNRvo= -github.com/coder/envbuilder v1.0.0-rc.0.0.20240927195324-5c150b3c1e35 h1:VtiMOd1q774fVZTSDuRlQcKbkQ1iNIDd2sqxcZ81cf0= -github.com/coder/envbuilder v1.0.0-rc.0.0.20240927195324-5c150b3c1e35/go.mod h1:1Qn60Fx3oGZlwmRfTNkrGxrQJsEZ7XIUUPgzil2lte8= +github.com/coder/envbuilder v1.0.2 h1:39YnrQKFoUW6++gdfV/TELOW8dZLE2VN3sxXbkYoaj4= +github.com/coder/envbuilder v1.0.2/go.mod h1:CkP/qKzWmK14I/aSPwEXoEHlss7OqYDmaM8Q7rDhwt8= github.com/coder/kaniko v0.0.0-20240925122543-caa18967f374 h1:/cyXf0vTSwFh7evQqeWHXXl14aRfC4CsNIYxOenJytQ= github.com/coder/kaniko v0.0.0-20240925122543-caa18967f374/go.mod h1:XoTDIhNF0Ll4tLmRYdOn31udU9w5zFrY2PME/crSRCA= github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0 h1:3A0ES21Ke+FxEM8CXx9n47SZOKOpgSE1bbJzlE4qPVs= From 6dd97eccedc3b50e30fe1f3ffbeb2c00c677e859 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Wed, 2 Oct 2024 11:10:24 +0000 Subject: [PATCH 2/2] fix init command string check --- internal/provider/provider_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/provider/provider_test.go b/internal/provider/provider_test.go index ef58b73..1df4490 100644 --- a/internal/provider/provider_test.go +++ b/internal/provider/provider_test.go @@ -194,7 +194,7 @@ SCANLOGS: } log := scanner.Text() t.Logf("envbuilder: %s", log) - if strings.Contains(log, "=== Running the init command") { + if strings.Contains(log, "=== Running init command") { break SCANLOGS } }