Compare commits

...

2 Commits

Author SHA1 Message Date
407aa3b063 Merge pull request 'Simplify logic around triggering full build on webserver' (#4398) from fix-rebuild into master
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: #4398
2024-08-23 11:03:54 +00:00
91b49c6323
Simplify logic around triggering full build on webserver
All checks were successful
continuous-integration/drone/pr Build is passing
2024-08-23 13:01:45 +02:00
2 changed files with 3 additions and 2 deletions

View File

@ -67,8 +67,9 @@ fi
[ -z "$inc_scaffold" ] && . "$basedir/build/scaffold.sh" [ -z "$inc_scaffold" ] && . "$basedir/build/scaffold.sh"
case "$command" in case "$command" in
git_build_into) if [ "${statusdir}/full_build" -nt "${statusdir}/../index.cgi" ]; then git_build_into) if [ -f "${statusdir}/full_build" ]; then
debug "discovered flag file, performing full build" debug "discovered flag file, performing full build"
rm "${statusdir}/full_build"
build_into build_into
else else
git_build_into git_build_into

View File

@ -70,7 +70,7 @@ cat <<-HTML_END
<dt>Duration:</dt><dd>$([ "$duration" -gt 0 ] && duration ${duration})</dd> <dt>Duration:</dt><dd>$([ "$duration" -gt 0 ] && duration ${duration})</dd>
<dt>Termination Status:</dt><dd>${term_status:-running...}</dd> <dt>Termination Status:</dt><dd>${term_status:-running...}</dd>
</dl> </dl>
$(if [ ./$DATADIR/full_build -nt ./index.cgi ]; then $(if [ -f ./$DATADIR/full_build ]; then
printf '<span class="fullbuild">Full rebuild will be started within next minute.</span>' printf '<span class="fullbuild">Full rebuild will be started within next minute.</span>'
else else
printf '<a class="fullbuild" href="./?full_build">Schedule full rebuild</a>' printf '<a class="fullbuild" href="./?full_build">Schedule full rebuild</a>'