task-monitor.html
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 content %} 9<x-frame style="--width: 896px;" class="flexible-space"> 10<x-hbox class="box-center"> 11<h1>{% trans %}Task results{% endtrans %}</h1> 12<div class="flexible-space"></div> 13{% if result.ready() %} 14<iconify-icon icon="mdi:check" style="font-size: 2em; color: var(--color-success);"></iconify-icon> 15{% trans %}Done{% endtrans %} 16{% else %} 17<iconify-icon icon="material-symbols:autorenew" style="animation: rotate 1000ms linear infinite; font-size: 2em; color: var(--color-info);"></iconify-icon> 18{% trans %}Running...{% endtrans %} 19{% endif %} 20</x-hbox> 21 22{% if result.get()[0] == "merge_simulator" %} 23{% if result.get()[1] %} 24<h2>{% trans %}Info{% endtrans %}</h2> 25<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[1] | decode }}</pre> 26{% endif %} 27{% if result.get()[2] %} 28<h2>{% trans %}Errors{% endtrans %}</h2> 29<pre aria-busy="true" aria-describedby="task-progress">{{ result.get()[2] | decode }}</pre> 30{% endif %} 31 32{% if result.get()[7] %} 33<h2>{% trans %}Cannot merge your branches{% endtrans %}</h2> 34<p> 35{% trans %}Since we can't help you with this yet, you'll need to resolve the merge conflicts on your own computer.{% endtrans %} 36</p> 37<p> 38{% trans %}In a shell inside your repository execute:{% endtrans %} 39</p> 40{% if result.get()[3] != result.get()[5] %} 41<pre> 42<span class="decorative-dollar">git remote add UPSTREAM {{ result.get()[3] }}</span> 43<span class="decorative-dollar">git remote update</span> 44<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span> 45<span class="decorative-dollar">git merge --allow-unrelated-histories UPSTREAM/{{ result.get()[4] }}</span></pre> 46<p> 47{% trans %}Then fix your conflicts, merge, and finally, run:{% endtrans %} 48</p> 49<pre> 50<span class="decorative-dollar">git remote rm UPSTREAM</span></pre> 51<p> 52{% trans %}and push the changes.{% endtrans %} 53</p> 54{% else %} 55<pre> 56<span class="decorative-dollar">git checkout {{ result.get()[6] }}</span> 57<span class="decorative-dollar">git merge {{ result.get()[4] }}</span></pre> 58<p> 59{% trans %}Resolve your conflicts and merge, then push.{% endtrans %} 60</p> 61{% endif %} 62{% else %} 63<h2>{% trans %}Merge simulation went well; continue?{% endtrans %}</h2> 64<a href="{{ result.get()[5] }}/prs/{{ request.args.get('pr-id') }}/merge" class="button">{% trans %}Merge{% endtrans %}</a> 65{% endif %} 66{% endif %} 67</x-frame> 68<style> 69@keyframes rotate { 700% { 71transform: rotate(0); 72} 73100% { 74transform: rotate(1turn); 75} 76} 77 78.decorative-dollar::before { 79content: "$ "; 80} 81</style> 82{% endblock %} 83