submit-queue.tmpl: move HEAD information to result
This commit is contained in:
parent
ba62db97e9
commit
cd40e68dde
3 changed files with 29 additions and 13 deletions
|
@ -40,10 +40,6 @@
|
|||
<th scope="row">Branch Name:</th>
|
||||
<td>{{ .branchName }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">HEAD:</th>
|
||||
<td><code>{{ .HEAD }}</code></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row">Currently running:</th>
|
||||
<td>
|
||||
|
@ -70,16 +66,34 @@
|
|||
</div>
|
||||
<div id="history-collapse-{{ $i }}" class="collapse {{ if eq $i 0 }} show{{ end }}" data-parent="#history-accordion">
|
||||
<div class="card-body">
|
||||
<!--// TODO: HEAD-->
|
||||
{{ if $result.Error }}
|
||||
<div class="text-danger">{{ $result.Error }}</div>
|
||||
{{ end }}
|
||||
<div class="bg-dark text-white">
|
||||
{{ range $logEntry := $result.LogEntries }}
|
||||
<code>{{ $logEntry }}</code>
|
||||
<table class="table">
|
||||
<tbody>
|
||||
<tr>
|
||||
<th scope="row">HEAD:</th>
|
||||
<td><code>{{ .HEAD }}</code></td>
|
||||
</tr>
|
||||
{{ if $result.Error }}
|
||||
<tr>
|
||||
<th scope="row">Error:</th>
|
||||
<td class="text-danger">{{ $result.Error }}</td>
|
||||
</td>
|
||||
</tr>
|
||||
{{ end }}
|
||||
</div>
|
||||
{{ block "series" $result.Series}}{{ end }}
|
||||
<tr>
|
||||
<th scope="row">Log:</th>
|
||||
<td class="bg-dark text-white">
|
||||
{{ range $logEntry := $result.LogEntries }}
|
||||
<code>{{ $logEntry }}</code><br />
|
||||
{{ end }}
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
{{ block "series" $result.Series}}{{ end }}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -17,6 +17,7 @@ type Result struct {
|
|||
Series []Serie
|
||||
Error error
|
||||
startTime time.Time
|
||||
HEAD string
|
||||
}
|
||||
|
||||
// MakeResult produces a new Result struct,
|
||||
|
|
|
@ -171,6 +171,7 @@ func (s *SubmitQueue) Run(fetchOnly bool) *Result {
|
|||
return r
|
||||
}
|
||||
s.HEAD = commitID
|
||||
r.HEAD = commitID
|
||||
|
||||
err = s.LoadSeries(log)
|
||||
if err != nil {
|
||||
|
|
Loading…
Reference in a new issue