mirror of
				https://gitea.com/Lydanne/buildx.git
				synced 2025-11-04 18:13:42 +08:00 
			
		
		
		
	Merge pull request #2650 from crazy-max/fix-subrequest-metadatafile
build: skip build ref and provenance metadata for subrequests
This commit is contained in:
		@@ -510,10 +510,12 @@ func BuildWithResultHandler(ctx context.Context, nodes []builder.Node, opt map[s
 | 
			
		||||
					for k, v := range printRes {
 | 
			
		||||
						rr.ExporterResponse[k] = string(v)
 | 
			
		||||
					}
 | 
			
		||||
					rr.ExporterResponse["buildx.build.ref"] = buildRef
 | 
			
		||||
					if node.Driver.HistoryAPISupported(ctx) {
 | 
			
		||||
						if err := setRecordProvenance(ctx, c, rr, so.Ref, opt.ProvenanceResponseMode, pw); err != nil {
 | 
			
		||||
							return err
 | 
			
		||||
					if opt.PrintFunc == nil {
 | 
			
		||||
						rr.ExporterResponse["buildx.build.ref"] = buildRef
 | 
			
		||||
						if node.Driver.HistoryAPISupported(ctx) {
 | 
			
		||||
							if err := setRecordProvenance(ctx, c, rr, so.Ref, opt.ProvenanceResponseMode, pw); err != nil {
 | 
			
		||||
								return err
 | 
			
		||||
							}
 | 
			
		||||
						}
 | 
			
		||||
					}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1271,6 +1271,6 @@ target "default" {}
 | 
			
		||||
	}
 | 
			
		||||
	var md mdT
 | 
			
		||||
	require.NoError(t, json.Unmarshal(dt, &md), dt)
 | 
			
		||||
	require.NotEmpty(t, md.Default.BuildRef)
 | 
			
		||||
	require.Empty(t, md.Default.BuildRef)
 | 
			
		||||
	require.Len(t, md.Default.ResultJSON.Warnings, 3)
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1228,7 +1228,7 @@ COPy --from=base \
 | 
			
		||||
		}
 | 
			
		||||
		var md mdT
 | 
			
		||||
		require.NoError(t, json.Unmarshal(dt, &md), dt)
 | 
			
		||||
		require.NotEmpty(t, md.BuildRef)
 | 
			
		||||
		require.Empty(t, md.BuildRef)
 | 
			
		||||
		require.Len(t, md.ResultJSON.Warnings, 3)
 | 
			
		||||
	})
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user