Skip to content
This repository has been archived by the owner on Jun 2, 2023. It is now read-only.

Commit

Permalink
fix builds
Browse files Browse the repository at this point in the history
  • Loading branch information
jirfag committed Nov 7, 2018
1 parent 82a2bfd commit e557432
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
build:
docker:
# specify the version
- image: circleci/golang:1.9
- image: circleci/golang:1.11
- image: redis

# Specify service dependencies here if necessary
Expand Down
3 changes: 3 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ linters:
- prealloc
- dupl # temporary
- gosec
- scopelint
- gochecknoglobals
- gochecknoinits
6 changes: 2 additions & 4 deletions app/lib/executors/shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ func (s shell) runAsync(ctx context.Context, name string, args ...string) (int,
return 0, nil, nil, err
}

return cmd.Process.Pid, outReader, func() error {
// XXX: it's important to not change error here, because it holds exit code
return cmd.Wait()
}, nil
// XXX: it's important to not change error here, because it holds exit code
return cmd.Process.Pid, outReader, cmd.Wait, nil
}

0 comments on commit e557432

Please sign in to comment.