build: exit 1 when manifest merge failed

jaihwan104 · jsternberg · commit f6830f3b865d · 2024-05-16T12:13:59.000-05:00
Signed-off-by: jaihwan104 <42341126+jaihwan104@users.noreply.github.com> (cherry picked from commit f282351)
diff --git a/build/build.go b/build/build.go
@@ -541,7 +541,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 {
+					err := progress.Write(pw, fmt.Sprintf("merging manifest list %s", pushNames), func() error {
 						descs := make([]specs.Descriptor, 0, len(res))
 
 						for _, r := range res {
@@ -637,6 +637,9 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 						}
 						return nil
 					})
+					if err != nil {
+						return err
+					}
 				}
 				return nil
 			})
diff --git a/util/progress/writer.go b/util/progress/writer.go
@@ -15,7 +15,7 @@ type Writer interface {
 	ClearLogSource(interface{})
 }
 
-func Write(w Writer, name string, f func() error) {
+func Write(w Writer, name string, f func() error) error {
 	dgst := digest.FromBytes([]byte(identity.NewID()))
 	tm := time.Now()
 
@@ -40,6 +40,8 @@ func Write(w Writer, name string, f func() error) {
 	w.Write(&client.SolveStatus{
 		Vertexes: []*client.Vertex{&vtx2},
 	})
+
+	return err
 }
 
 func WriteBuildRef(w Writer, target string, ref string) {

Original file line number	Diff line number	Diff line change
`@@ -541,7 +541,7 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s`
`541`	`541`	`}`
`542`	`542`
`543`	`543`	`if pushNames != "" {`
`544`		`- progress.Write(pw, fmt.Sprintf("merging manifest list %s", pushNames), func() error {`
	`544`	`+ err := progress.Write(pw, fmt.Sprintf("merging manifest list %s", pushNames), func() error {`
`545`	`545`	`descs := make([]specs.Descriptor, 0, len(res))`
`546`	`546`
`547`	`547`	`for _, r := range res {`
`@@ -637,6 +637,9 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s`
`637`	`637`	`}`
`638`	`638`	`return nil`
`639`	`639`	`})`
	`640`	`+ if err != nil {`
	`641`	`+ return err`
	`642`	`+ }`
`640`	`643`	`}`
`641`	`644`	`return nil`
`642`	`645`	`})`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ type Writer interface {`
`15`	`15`	`ClearLogSource(interface{})`
`16`	`16`	`}`
`17`	`17`
`18`		`-func Write(w Writer, name string, f func() error) {`
	`18`	`+func Write(w Writer, name string, f func() error) error {`
`19`	`19`	`dgst := digest.FromBytes([]byte(identity.NewID()))`
`20`	`20`	`tm := time.Now()`
`21`	`21`
`@@ -40,6 +40,8 @@ func Write(w Writer, name string, f func() error) {`
`40`	`40`	`w.Write(&client.SolveStatus{`
`41`	`41`	`Vertexes: []*client.Vertex{&vtx2},`
`42`	`42`	`})`
	`43`	`+`
	`44`	`+ return err`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`func WriteBuildRef(w Writer, target string, ref string) {`