Merge pull request #249 from depot/merge-manifest-errors

Capture and report errors when merging manifests
depot · Feb 21, 2024 · 51952a4 · 51952a4
2 parents 6f18158 + 86552cf
commit 51952a4
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/pkg/buildx/build/build.go b/pkg/buildx/build/build.go
@@ -1132,7 +1132,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 				}
 
 				if pushNames != "" {
-					progress.Write(pw, fmt.Sprintf("merging manifest list %s", pushNames), func() error {
+					mergeManifestList := func() error {
 						descs := make([]specs.Descriptor, 0, len(res))
 
 						for _, r := range res {
@@ -1257,7 +1257,17 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 							}
 						}
 						return nil
+					}
+
+					var mergeErr error
+					progress.Write(pw, fmt.Sprintf("merging manifest list %s", pushNames), func() error {
+						mergeErr = mergeManifestList()
+						return mergeErr
 					})
+
+					if mergeErr != nil {
+						return mergeErr
+					}
 				}
 				return nil
 			})