Sutty/panel
5
0
Fork 0
mirror of https://0xacab.org/sutty/sutty synced 2024-11-26 21:26:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'issue-10464' into panel.sutty.nl

Browse source
This commit is contained in:
f 2023-03-18 19:04:06 -03:00
commit 1346d1ee82
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/jobs/deploy_job.rb
View file

@ -34,8 +34,8 @@ class DeployJob < ApplicationJob
begin begin
raise DeployException, 'Una dependencia falló' if failed_dependencies? d raise DeployException, 'Una dependencia falló' if failed_dependencies? d
status = d.deploy status = d.deploy(output: @output)
seconds = d.build_stats.last.try(:seconds) seconds = d.build_stats.last.try(:seconds) || 0
size = d.size size = d.size
urls = d.respond_to?(:urls) ? d.urls : [d.url].compact urls = d.respond_to?(:urls) ? d.urls : [d.url].compact
rescue StandardError => e rescue StandardError => e
@ -64,14 +64,14 @@ class DeployJob < ApplicationJob
t << ([type.to_s] + row.values) t << ([type.to_s] + row.values)
end end
end) end)
puts "\a"
rescue DeployTimedOutException => e rescue DeployTimedOutException => e
notify_exception e notify_exception e
ensure ensure
@site&.update status: 'waiting' @site&.update status: 'waiting'
notify_usuaries if notify notify_usuaries if notify
puts "\a" if @output
end end
end end
# rubocop:enable Metrics/MethodLength # rubocop:enable Metrics/MethodLength

2
app/models/deploy_private.rb
View file

@ -6,6 +6,8 @@
# XXX: La plantilla tiene que soportar esto con el plugin # XXX: La plantilla tiene que soportar esto con el plugin
# jekyll-private-data # jekyll-private-data
class DeployPrivate < DeployLocal class DeployPrivate < DeployLocal
DEPENDENCIES = %i[deploy_local]
# No es necesario volver a instalar dependencias # No es necesario volver a instalar dependencias
def deploy(output: false) def deploy(output: false)
jekyll_build(output: output) jekyll_build(output: output)