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

fix: lake: v4.16.0-rc1 trace issues #6627

Merged
merged 1 commit into from
Jan 13, 2025
Merged

fix: lake: v4.16.0-rc1 trace issues #6627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/lake/Lake/Build/Job.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ results of `a` and `b`. The job `c` errors if either `a` or `b` error.
/-- Merges this job with another, discarding its output and trace. -/
def add (self : Job α) (other : Job β) : Job α :=
self.zipResultWith (other := other) fun
| .ok a sa, .ok _ sb => .ok a (sa.merge sb)
| .ok a sa, .ok _ sb => .ok a {sa.merge sb with trace := sa.trace}
| ra, rb => .error 0 {ra.state.merge rb.state with trace := ra.state.trace}

/-- Merges this job with another, discarding both outputs. -/
Expand Down
Loading