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/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ jobs:
- name: Lint (linux)
uses: golangci/golangci-lint-action@v9
with:
version: v2.14.0
version: v2.15.0

- name: Lint (darwin)
uses: golangci/golangci-lint-action@v9
with:
version: v2.14.0
version: v2.15.0
env:
GOOS: darwin

Expand Down
8 changes: 5 additions & 3 deletions cmd/devbox/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,15 @@ func containerExec(ctx context.Context, containerID string, cmd []string) (stdou
done := make(chan error)

go func() {
_, err = stdcopy.StdCopy(&stdout, &stderr, execAttachResp.Reader)
_, err := stdcopy.StdCopy(&stdout, &stderr, execAttachResp.Reader)
done <- err
}()

select {
case <-done:
break
case err := <-done:
if err != nil {
return nil, nil, fmt.Errorf("failed to copy exec output: %w", err)
}
case <-ctx.Done():
return nil, nil, errors.New("context cancelled")
}
Expand Down
Loading