Build the merge preview's module trees with mesh-sdk's ModuleTrees and re-pin mesh-sdk to 78364e31, so the two fetch steps share it (issues 1675, 1676)

2026-10-21 21:24:24 +02:00
parent d5804927b3
commit aa0eaa6c52
9 changed files with 22 additions and 122 deletions
@@ -54,11 +54,11 @@ type FetchResult struct {
 	// commit, the merge commit of the head onto it, the paths the merge changes and the tree of each module directory.
 	// A head that does not merge cleanly is an answer: Merge is empty, Conflicts names the files, and the workspace is
 	// left at the trunk commit with nothing installed.
-	Base      string                `json:"base,omitempty"`
-	Merge     string                `json:"merge,omitempty"`
-	Conflicts []string              `json:"conflicts,omitempty"`
-	Changed   []string              `json:"changed,omitempty"`
-	Trees     map[string]ModuleTree `json:"trees,omitempty"`
+	Base      string                          `json:"base,omitempty"`
+	Merge     string                          `json:"merge,omitempty"`
+	Conflicts []string                        `json:"conflicts,omitempty"`
+	Changed   []string                        `json:"changed,omitempty"`
+	Trees     map[string]buildstep.ModuleTree `json:"trees,omitempty"`
 }

 // Refusal is a module a fetch did not install the packages of.