Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add top level exitCode to RunSummary #4343

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Add top level exitCode to RunSummary #4343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c90dff
Add top level exitCode to RunSummary
mehulkar Mar 24, 2023
edf6b25
Merge branch 'main' into mehulkar/turbo-924-add-top-level-exitcode-to…
mehulkar Mar 25, 2023
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
2 changes: 2 additions & 0 deletions cli/integration_tests/basic_monorepo/run_summary.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ Setup
$ cat $(/bin/ls .turbo/runs/*.json | head -n1) | jq '.version'
"0"

$ cat $(/bin/ls .turbo/runs/*.json | head -n1) | jq '.executionSummary.exitCode'
0
$ cat $(/bin/ls .turbo/runs/*.json | head -n1) | jq '.executionSummary.attempted'
2
$ cat $(/bin/ls .turbo/runs/*.json | head -n1) | jq '.executionSummary.cached'
Expand Down
2 changes: 1 addition & 1 deletion cli/internal/run/real_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func RealRun(
base.UI.Error(err.Error())
}

runSummary.Close(base.RepoRoot)
runSummary.Close(exitCode, base.RepoRoot)

if exitCode != 0 {
return &process.ChildExit{
Expand Down
3 changes: 3 additions & 0 deletions cli/internal/runsummary/execution_summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ type executionSummary struct {
attempted int
startedAt time.Time
endedAt time.Time
exitCode int
}

// MarshalJSON munges the executionSummary into a format we want
Expand All @@ -110,13 +111,15 @@ func (es *executionSummary) MarshalJSON() ([]byte, error) {
Attempted int `json:"attempted"`
StartTime int64 `json:"startTime"`
EndTime int64 `json:"endTime"`
ExitCode int `json:"exitCode"`
}{
StartTime: es.startedAt.UnixMilli(),
EndTime: es.endedAt.UnixMilli(),
Success: es.success,
Failure: es.failure,
Cached: es.cached,
Attempted: es.attempted,
ExitCode: es.exitCode,
}

return json.Marshal(&serializable)
Expand Down
3 changes: 2 additions & 1 deletion cli/internal/runsummary/run_summary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ func NewRunSummary(
}

// Close wraps up the RunSummary at the end of a `turbo run`.
func (rsm *Meta) Close(dir turbopath.AbsoluteSystemPath) {
func (rsm *Meta) Close(exitCode int, dir turbopath.AbsoluteSystemPath) {
rsm.RunSummary.ExecutionSummary.exitCode = exitCode
rsm.RunSummary.ExecutionSummary.endedAt = time.Now()

summary := rsm.RunSummary
Expand Down