mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

submit-queue.tmpl: move HEAD information to result

Browse source
This commit is contained in:
Florian Klink 2019-11-27 19:39:42 +01:00
parent ba62db97e9
commit cd40e68dde
3 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
public/submit-queue.tmpl.html
View file

@ -40,10 +40,6 @@
<th scope="row">Branch Name:</th> <th scope="row">Branch Name:</th>
<td>{{ .branchName }}</td> <td>{{ .branchName }}</td>
</tr> </tr>
<tr>
<th scope="row">HEAD:</th>
<td><code>{{ .HEAD }}</code></td>
</tr>
<tr> <tr>
<th scope="row">Currently running:</th> <th scope="row">Currently running:</th>
<td> <td>
@ -70,16 +66,34 @@
</div> </div>
<div id="history-collapse-{{ $i }}" class="collapse {{ if eq $i 0 }} show{{ end }}" data-parent="#history-accordion"> <div id="history-collapse-{{ $i }}" class="collapse {{ if eq $i 0 }} show{{ end }}" data-parent="#history-accordion">
<div class="card-body"> <div class="card-body">
<!--// TODO: HEAD--> <table class="table">
<tbody>
<tr>
<th scope="row">HEAD:</th>
<td><code>{{ .HEAD }}</code></td>
</tr>
{{ if $result.Error }} {{ if $result.Error }}
<div class="text-danger">{{ $result.Error }}</div> <tr>
<th scope="row">Error:</th>
<td class="text-danger">{{ $result.Error }}</td>
</td>
</tr>
{{ end }} {{ end }}
<div class="bg-dark text-white"> <tr>
<th scope="row">Log:</th>
<td class="bg-dark text-white">
{{ range $logEntry := $result.LogEntries }} {{ range $logEntry := $result.LogEntries }}
<code>{{ $logEntry }}</code> <code>{{ $logEntry }}</code><br />
{{ end }} {{ end }}
</div> </td>
</tr>
<tr>
<td colspan="2">
{{ block "series" $result.Series}}{{ end }} {{ block "series" $result.Series}}{{ end }}
</td>
</tr>
</tbody>
</table>
</div> </div>
</div> </div>
</div> </div>

1
submitqueue/result.go
View file

@ -17,6 +17,7 @@ type Result struct {
Series []Serie Series []Serie
Error error Error error
startTime time.Time startTime time.Time
HEAD string
} }
// MakeResult produces a new Result struct, // MakeResult produces a new Result struct,

1
submitqueue/submitqueue.go
View file

@ -171,6 +171,7 @@ func (s *SubmitQueue) Run(fetchOnly bool) *Result {
return r return r
} }
s.HEAD = commitID s.HEAD = commitID
r.HEAD = commitID
err = s.LoadSeries(log) err = s.LoadSeries(log)
if err != nil { if err != nil {