Skip to content

Commit 4cbd6c4

Browse files
committed
Harmonize WithEnvOptions to plural
Also ensure binDir option is used in all workflows
1 parent 0b7a1f5 commit 4cbd6c4

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

tools/setup-envtest/main.go

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,14 @@ Environment Variables:
216216
use.ForceDownload(*force),
217217
use.NoDownload(*installedOnly),
218218
use.VerifySum(*verify),
219-
use.WithEnvOption(env.WithClient(&sremote.Client{
220-
Bucket: *remoteBucket,
221-
Server: *remoteServer,
222-
Log: globalLog.WithName("remote-client"),
223-
})),
219+
use.WithEnvOptions(
220+
env.WithClient(&remote.Client{
221+
Bucket: *remoteBucket,
222+
Server: *remoteServer,
223+
Log: globalLog.WithName("remote-client"),
224+
}),
225+
env.WithStoreAt(*binDir),
226+
),
224227
)
225228
if err != nil {
226229
envp.Exit(2, err.Error())
@@ -237,11 +240,14 @@ Environment Variables:
237240
logr.NewContext(context.Background(), globalLog.WithName("list")),
238241
version,
239242
list.NoDownload(*installedOnly),
240-
list.WithEnvOption(env.WithClient(&sremote.Client{
241-
Bucket: *remoteBucket,
242-
Server: *remoteServer,
243-
Log: globalLog.WithName("remote-client"),
244-
})),
243+
list.WithEnvOptions(
244+
env.WithClient(&remote.Client{
245+
Bucket: *remoteBucket,
246+
Server: *remoteServer,
247+
Log: globalLog.WithName("remote-client"),
248+
}),
249+
env.WithStoreAt(*binDir),
250+
),
245251
list.WithPlatform(*targetOS, *targetArch),
246252
)
247253
if err != nil {
@@ -263,6 +269,7 @@ Environment Variables:
263269
Server: *remoteServer,
264270
Log: globalLog.WithName("remote-client"),
265271
}),
272+
env.WithStoreAt(*binDir),
266273
),
267274
cleanup.WithPlatform(*targetOS, *targetArch),
268275
)

0 commit comments

Comments
 (0)