Skip to content

Commit 7e16bc0

Browse files
committed
combined output
1 parent 32fae9d commit 7e16bc0

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

.evergreen/buildvariants-and-tasks.in.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ tasks:
460460
- func: spawn-signing-server
461461
- func: package
462462
vars:
463-
debug: 'hadron*,mongo*,compass*,electron*,sign*,electron-windows-installer:main'
463+
debug: 'hadron*,mongo*,compass*,electron*,sign*'
464464
compass_distribution: <%= distribution %>
465465
- func: verify-artifacts
466466
- func: save-all-artifacts

.evergreen/buildvariants-and-tasks.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,7 @@ tasks:
448448
- func: spawn-signing-server
449449
- func: package
450450
vars:
451-
debug: >-
452-
hadron*,mongo*,compass*,electron*,sign*,electron-windows-installer:main
451+
debug: hadron*,mongo*,compass*,electron*,sign*
453452
compass_distribution: compass
454453
- func: verify-artifacts
455454
- func: save-all-artifacts
@@ -472,8 +471,7 @@ tasks:
472471
- func: spawn-signing-server
473472
- func: package
474473
vars:
475-
debug: >-
476-
hadron*,mongo*,compass*,electron*,sign*,electron-windows-installer:main
474+
debug: hadron*,mongo*,compass*,electron*,sign*
477475
compass_distribution: compass-isolated
478476
- func: verify-artifacts
479477
- func: save-all-artifacts
@@ -496,8 +494,7 @@ tasks:
496494
- func: spawn-signing-server
497495
- func: package
498496
vars:
499-
debug: >-
500-
hadron*,mongo*,compass*,electron*,sign*,electron-windows-installer:main
497+
debug: hadron*,mongo*,compass*,electron*,sign*
501498
compass_distribution: compass-readonly
502499
- func: verify-artifacts
503500
- func: save-all-artifacts
9.5 KB
Binary file not shown.

packages/hadron-build/signtool/signtool.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,13 @@ func main() {
5959
cmd := exec.Command("node", "-e", script)
6060
fmt.Println("Running command:", cmd.String())
6161

62-
cmd.Stdout = os.Stdout
63-
cmd.Stderr = os.Stderr
62+
// cmd.Stdout = os.Stdout
63+
// cmd.Stderr = os.Stderr
6464

65-
err := cmd.Run()
65+
stdoutStderr, err := cmd.CombinedOutput()
6666
if err != nil {
6767
fmt.Println("Error signing the file")
68+
fmt.Printf("%s\n", stdoutStderr)
6869
fmt.Println(err)
6970
// if we error out then we won't see much because of how electron-windows-installer fails
7071
return

0 commit comments

Comments
 (0)