Skip to content

Commit 128a1e6

Browse files
committed
fix: lake: v4.16.0-rc1 trace issues (#6627)
This PR aims to fix the trace issues reported by Mathlib that are breaking `lake exe cache` in downstream projects. (cherry picked from commit a6eea4b)
1 parent e9dfa2f commit 128a1e6

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/lake/Lake/Build/Job.lean

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ results of `a` and `b`. The job `c` errors if either `a` or `b` error.
265265
/-- Merges this job with another, discarding its output and trace. -/
266266
def add (self : Job α) (other : Job β) : Job α :=
267267
self.zipResultWith (other := other) fun
268-
| .ok a sa, .ok _ sb => .ok a (sa.merge sb)
268+
| .ok a sa, .ok _ sb => .ok a {sa.merge sb with trace := sa.trace}
269269
| ra, rb => .error 0 {ra.state.merge rb.state with trace := ra.state.trace}
270270

271271
/-- Merges this job with another, discarding both outputs. -/

0 commit comments

Comments
 (0)