Skip to content

Commit ec9b488

Browse files
authored
Upgrade lib to have fix for PipeOutput deadlock (#615)
PR on the other side: https://github.com/sourcegraph/sourcegraph/pull/24654
1 parent f9632c4 commit ec9b488

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/sourcegraph/batch-change-utils v0.0.0-20210708162152-c9f35b905d94
2323
github.com/sourcegraph/go-diff v0.6.1
2424
github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf
25-
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210906124104-d18be6b57521
25+
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210907041800-ae0266126192
2626
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
2727
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
2828
golang.org/x/net v0.0.0-20210614182718-04defd469f4e

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0H
261261
github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
262262
github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI=
263263
github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354=
264-
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210906124104-d18be6b57521 h1:buaBM1YCjWt6+DlXESM5EAmZ+SvlUteXpnyQmGa07HA=
265-
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210906124104-d18be6b57521/go.mod h1:ZK8mHKWdapYI8iIQwsO7QUxf44RjiNGKkOZa9aYIjTc=
264+
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210907041800-ae0266126192 h1:/OdZqWVKxON/1/J6a/cw2kZJtRNpampaFekn0Gnzefg=
265+
github.com/sourcegraph/sourcegraph/lib v0.0.0-20210907041800-ae0266126192/go.mod h1:ZK8mHKWdapYI8iIQwsO7QUxf44RjiNGKkOZa9aYIjTc=
266266
github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o=
267267
github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
268268
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=

internal/batches/executor/run_steps.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ func executeSingleStep(
327327
stderr := io.MultiWriter(&stderrBuffer, uiStderrWriter, opts.logger.PrefixWriter("stderr"))
328328

329329
// Setup readers that pipe the output into the given buffers
330-
wg, err := process.PipeOutput(cmd, stdout, stderr)
330+
wg, err := process.PipeOutput(ctx, cmd, stdout, stderr)
331331
if err != nil {
332332
return bytes.Buffer{}, bytes.Buffer{}, errors.Wrap(err, "piping process output")
333333
}

0 commit comments

Comments
 (0)