docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-19 01:47:43 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #1968 from jedevc/reset-dont-modify-input

Browse Source 
progress: don't modify ResetTime inputs
This commit is contained in:
Tõnis Tiigi 2023-07-31 16:02:23 +03:00 committed by GitHub
commit 10ff93f190
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
util/progress/reset.go
View File

@ -20,7 +20,9 @@ func (w *pw) Write(st *client.SolveStatus) {
} }
} }
if w.diff != nil { if w.diff != nil {
vertexes := make([]*client.Vertex, 0, len(st.Vertexes))
for _, v := range st.Vertexes { for _, v := range st.Vertexes {
v := *v
if v.Started != nil { if v.Started != nil {
d := v.Started.Add(-*w.diff) d := v.Started.Add(-*w.diff)
v.Started = &d v.Started = &d
@ -29,8 +31,12 @@ func (w *pw) Write(st *client.SolveStatus) {
d := v.Completed.Add(-*w.diff) d := v.Completed.Add(-*w.diff)
v.Completed = &d v.Completed = &d
} }
vertexes = append(vertexes, &v)
} }
statuses := make([]*client.VertexStatus, 0, len(st.Statuses))
for _, v := range st.Statuses { for _, v := range st.Statuses {
v := *v
if v.Started != nil { if v.Started != nil {
d := v.Started.Add(-*w.diff) d := v.Started.Add(-*w.diff)
v.Started = &d v.Started = &d
@ -40,9 +46,21 @@ func (w *pw) Write(st *client.SolveStatus) {
v.Completed = &d v.Completed = &d
} }
v.Timestamp = v.Timestamp.Add(-*w.diff) v.Timestamp = v.Timestamp.Add(-*w.diff)
statuses = append(statuses, &v)
} }
logs := make([]*client.VertexLog, 0, len(st.Logs))
for _, v := range st.Logs { for _, v := range st.Logs {
v := *v
v.Timestamp = v.Timestamp.Add(-*w.diff) v.Timestamp = v.Timestamp.Add(-*w.diff)
logs = append(logs, &v)
}
st = &client.SolveStatus{
Vertexes: vertexes,
Statuses: statuses,
Logs: logs,
Warnings: st.Warnings,
} }
} }
w.Writer.Write(st) w.Writer.Write(st)