From a6eea4b650037967b37b751db160689f33567a2e Mon Sep 17 00:00:00 2001 From: Mac Malone Date: Mon, 13 Jan 2025 09:16:07 -0500 Subject: [PATCH] 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. --- src/lake/Lake/Build/Job.lean | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lake/Lake/Build/Job.lean b/src/lake/Lake/Build/Job.lean index 6090f0eae9..e50115d5e2 100644 --- a/src/lake/Lake/Build/Job.lean +++ b/src/lake/Lake/Build/Job.lean @@ -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. -/