JohnHammond
/
buildkit
mirror of https://github.com/JohnHammond/buildkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2689 from tonistiigi/active-status 

progressui: handle active statuses for completed vertex
master
Tõnis Tiigi 2022-03-01 18:36:03 -08:00 committed by GitHub
parent 23242f23ca d75a79eacc
commit 2dfbe317c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/progress/progressui/printer.go
View File

@ -81,6 +81,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
} }
v.events = v.events[:0] v.events = v.events[:0]
isOpenStatus := false // remote cache loading can currently produce status updates without active vertex
for _, s := range v.statuses { for _, s := range v.statuses {
if _, ok := v.statusUpdates[s.ID]; ok { if _, ok := v.statusUpdates[s.ID]; ok {
doPrint := true doPrint := true
@ -124,6 +125,8 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
} }
if s.Completed != nil { if s.Completed != nil {
tm += " done" tm += " done"
} else {
isOpenStatus = true
} }
fmt.Fprintf(p.w, "#%d %s%s%s\n", v.index, s.ID, bytes, tm) fmt.Fprintf(p.w, "#%d %s%s%s\n", v.index, s.ID, bytes, tm)
} }
@ -163,7 +166,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
} }
p.current = dgst p.current = dgst
if v.Completed != nil { if v.Completed != nil && !isOpenStatus {
p.current = "" p.current = ""
v.count = 0 v.count = 0