HTML document, ASCII text
1
{% extends "default.html" %}
2
{% block title %}
3
{% trans result_id=result.id %}Task monitor for {{ result_id }}{% endtrans %}
4
{% endblock %}
5
{% block breadcrumbs %}
6
<li><a href="/task/{{ result.id }}">{% trans result_id=result.id %}Task {{ result_id }}{% endtrans %}</a></li>
7
{% endblock %}
8
{% block favicon %}
9
{% if result.ready() %}
10
<link rel="shortcut icon" href="/static/logo-ready.svg">
11
{% else %}
12
<link rel="shortcut icon" href="/static/logo-wait.svg">
13
{% endif %}
14
{% endblock %}
15
{% block content %}
16
{# Update every 5 seconds #}
17
<x-frame style="--width: 896px;" class="flexible-space" {% if not result.ready() %}hx-swap="outerHTML" hx-get={{ modify_query(partial=1) }} hx-trigger="load delay:{{ delay }}ms"{% endif %}>
18
<x-hbox class="box-center">
19
<h1>{% trans %}Task results{% endtrans %}</h1>
20
<div class="flexible-space"></div>
21
{% if result.ready() %}
22
<iconify-icon icon="mdi:check" style="font-size: 2em; color: var(--color-success);"></iconify-icon>
23
{% trans %}Done{% endtrans %}
24
{% else %}
25
<iconify-icon icon="material-symbols:autorenew" style="font-size: 2em; color: var(--color-info);"></iconify-icon>
26
{% trans %}Running...{% endtrans %}
27
{% endif %}
28
</x-hbox>
29
{% if result.ready() %}
31
{% if result.get()[0] == "merge" %}
32
{% if result.get()[1] %}
33
<h2>{% trans %}Info{% endtrans %}</h2>
34
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre>
35
{% endif %}
36
{% if result.get()[2] %}
37
<h2>{% trans %}Errors{% endtrans %}</h2>
38
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre>
39
{% endif %}
40
{% endif %}
41
{% if result.get()[0] == "merge_simulator" %}
43
{% if result.get()[1] %}
44
<h2>{% trans %}Info{% endtrans %}</h2>
45
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre>
46
{% endif %}
47
{% if result.get()[2] %}
48
<h2>{% trans %}Errors{% endtrans %}</h2>
49
<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre>
50
{% endif %}
51
{% if result.get()[7] %}
53
<h2>{% trans %}Cannot merge your branches{% endtrans %}</h2>
54
<p>
55
{% trans %}Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.{% endtrans %}
56
</p>
57
<p>
58
{% trans %}In a shell inside your repository execute:{% endtrans %}
59
</p>
60
{% if result.get()[3] != result.get()[5] %}
61
<pre>
62
<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span>
63
<span class="decorative-dollar">git remote update</span>
64
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
65
<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre>
66
<p>
67
{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %}
68
</p>
69
<pre>
70
<span class="decorative-dollar">git remote rm UPSTREAM</span></pre>
71
<p>
72
{% trans %}and push the changes.{% endtrans %}
73
</p>
74
{% else %}
75
<pre>
76
<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span>
77
<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre>
78
<p>
79
{% trans %}Resolve your conflicts and merge, then push.{% endtrans %}
80
</p>
81
{% endif %}
82
{% else %}
83
<h2>{% trans %}Merge simulation went well; continue?{% endtrans %}</h2>
84
<a href="{{ result.get()[5] }}/prs/{{ request.args.get('pr-id') }}/merge" class="button">{% trans %}Merge{% endtrans %}</a>
85
{% endif %}
86
{% endif %}
87
{% endif %}
88
</x-frame>
89
<style>
90
@keyframes rotate {
91
0% {
92
transform: rotate(0);
93
}
94
100% {
95
transform: rotate(1turn);
96
}
97
}
98
.decorative-dollar::before {
100
content: "$ ";
101
}
102
</style>
103
{% endblock %}
104