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
4 changes: 2 additions & 2 deletions .github/workflows/pr-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -366,15 +366,15 @@ jobs:
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
PATH="${PATH}" \
GOROOT="${GOROOT}" \
go test -v -ginkgo.v -timeout 3600s --ginkgo.label-filter="${{ matrix.label }}"
go test -v -ginkgo.v -timeout 900s --ginkgo.label-filter="${{ matrix.label }}"
else
GH_USERNAME="${GH_USERNAME}" \
GH_ACCESS_TOKEN="${GH_ACCESS_TOKEN}" \
KUBECONFIG="${KUBECONFIG:-$HOME/.kube/config}" \
PATH="${PATH}" \
GOROOT="${GOROOT}" \
DOCKER_HOST="npipe:////./pipe/podman-machine-default" \
go test -v -ginkgo.v -timeout 3600s --ginkgo.label-filter="${{ matrix.label }}"
go test -v -ginkgo.v -timeout 900s --ginkgo.label-filter="${{ matrix.label }}"
fi

- name: verify docker is installed
Expand Down
18 changes: 8 additions & 10 deletions cmd/agent/workspace/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"fmt"
"os"

"github.com/sirupsen/logrus"
"github.com/skevetter/devpod/cmd/flags"
"github.com/skevetter/devpod/pkg/agent"
provider2 "github.com/skevetter/devpod/pkg/provider"
Expand Down Expand Up @@ -57,7 +56,12 @@ func (cmd *BuildCmd) Run(ctx context.Context) error {
// initialize the workspace
cancelCtx, cancel := context.WithCancel(ctx)
defer cancel()
_, logger, credentialsDir, err := initWorkspace(cancelCtx, cancel, workspaceInfo, cmd.Debug, false)
_, logger, credentialsDir, err := initWorkspace(initWorkspaceParams{
ctx: cancelCtx,
workspaceInfo: workspaceInfo,
debug: cmd.Debug,
shouldInstallDaemon: false,
})
if err != nil {
return err
} else if credentialsDir != "" {
Expand Down Expand Up @@ -93,15 +97,9 @@ func (cmd *BuildCmd) Run(ctx context.Context) error {
}

if workspaceInfo.CLIOptions.SkipPush {
logger.WithFields(logrus.Fields{
"imageName": imageName,
})
logger.Donef("done building image")
logger.Donef("done building image %s", imageName)
} else {
logger.WithFields(logrus.Fields{
"imageName": imageName,
})
logger.Donef("done building and pushing image")
logger.Donef("done building and pushing image %s", imageName)
}
}

Expand Down
Loading
Loading