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