Skip to content

Commit 97754be

Browse files
authored
refactor move binaries to provider (#435)
Signed-off-by: Samuel K <skevetter@pm.me>
1 parent d7226e6 commit 97754be

File tree

13 files changed

+828
-427
lines changed

13 files changed

+828
-427
lines changed

.github/workflows/pr-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,15 @@ jobs:
366366
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
367367
PATH="${PATH}" \
368368
GOROOT="${GOROOT}" \
369-
go test -v -ginkgo.v -timeout 3600s --ginkgo.label-filter="${{ matrix.label }}"
369+
go test -v -ginkgo.v -timeout 900s --ginkgo.label-filter="${{ matrix.label }}"
370370
else
371371
GH_USERNAME="${GH_USERNAME}" \
372372
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
373373
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
374374
PATH="${PATH}" \
375375
GOROOT="${GOROOT}" \
376376
DOCKER_HOST="npipe:////./pipe/podman-machine-default" \
377-
go test -v -ginkgo.v -timeout 3600s --ginkgo.label-filter="${{ matrix.label }}"
377+
go test -v -ginkgo.v -timeout 900s --ginkgo.label-filter="${{ matrix.label }}"
378378
fi
379379
380380
- name: verify docker is installed

cmd/agent/workspace/build.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"fmt"
66
"os"
77

8-
"github.com/sirupsen/logrus"
98
"github.com/skevetter/devpod/cmd/flags"
109
"github.com/skevetter/devpod/pkg/agent"
1110
provider2 "github.com/skevetter/devpod/pkg/provider"
@@ -57,7 +56,12 @@ func (cmd *BuildCmd) Run(ctx context.Context) error {
5756
// initialize the workspace
5857
cancelCtx, cancel := context.WithCancel(ctx)
5958
defer cancel()
60-
_, logger, credentialsDir, err := initWorkspace(cancelCtx, cancel, workspaceInfo, cmd.Debug, false)
59+
_, logger, credentialsDir, err := initWorkspace(initWorkspaceParams{
60+
ctx: cancelCtx,
61+
workspaceInfo: workspaceInfo,
62+
debug: cmd.Debug,
63+
shouldInstallDaemon: false,
64+
})
6165
if err != nil {
6266
return err
6367
} else if credentialsDir != "" {
@@ -93,15 +97,9 @@ func (cmd *BuildCmd) Run(ctx context.Context) error {
9397
}
9498

9599
if workspaceInfo.CLIOptions.SkipPush {
96-
logger.WithFields(logrus.Fields{
97-
"imageName": imageName,
98-
})
99-
logger.Donef("done building image")
100+
logger.Donef("done building image %s", imageName)
100101
} else {
101-
logger.WithFields(logrus.Fields{
102-
"imageName": imageName,
103-
})
104-
logger.Donef("done building and pushing image")
102+
logger.Donef("done building and pushing image %s", imageName)
105103
}
106104
}
107105

0 commit comments

Comments
 (0)