Browse Source

修复:流水线文件不存在报错

pull/347/head
yystopf 2 years ago
parent
commit
dd96e1e2da
2 changed files with 20 additions and 16 deletions
  1. +1
    -1
      app/controllers/api/v1/projects/actions/runs_controller.rb
  2. +19
    -15
      app/views/api/v1/projects/actions/runs/index.json.jbuilder

+ 1
- 1
app/controllers/api/v1/projects/actions/runs_controller.rb View File

@@ -2,11 +2,11 @@ class Api::V1::Projects::Actions::RunsController < Api::V1::Projects::Actions::B

def index
@result_object = Api::V1::Projects::Actions::Runs::ListService.call(@project, {workflow: params[:workflow], page: page, limit: limit}, current_user&.gitea_token)
puts @result_object
end

def job_show
@result_object = Api::V1::Projects::Actions::Runs::JobShowService.call(@project, params[:run_id], params[:job], params[:log_cursors], current_user&.gitea_token)
puts @result_object
end

end

+ 19
- 15
app/views/api/v1/projects/actions/runs/index.json.jbuilder View File

@@ -1,19 +1,23 @@
json.total_data @result_object[:total_data].to_i
json.runs @result_object[:data]["Runs"].each do |run|
json.workflow run["WorkflowID"]
json.index run["Index"]
json.title run["Title"]
json.trigger_user do
json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
end
if @result_object[:data]["Runs"].present?
json.runs @result_object[:data]["Runs"].each do |run|
json.workflow run["WorkflowID"]
json.index run["Index"]
json.title run["Title"]
json.trigger_user do
json.partial! 'api/v1/users/commit_user', locals: { user: render_cache_commit_author(run['TriggerUser']), name: run['TriggerUser']['Name'] }
end

if run["Ref"].starts_with?("refs/tags")
json.ref run["Ref"].gsub!("/refs/tags/", "")
else
json.ref run["Ref"].gsub!("refs/heads/", "")
end
if run["Ref"].starts_with?("refs/tags")
json.ref run["Ref"].gsub!("/refs/tags/", "")
else
json.ref run["Ref"].gsub!("refs/heads/", "")
end

json.status run["Status"]
json.time_ago time_from_now(run["Stopped"])
json.holding_time run["Stopped"]-run["Started"]
json.status run["Status"]
json.time_ago time_from_now(run["Stopped"])
json.holding_time run["Stopped"]-run["Started"]
end
else
json.runs []
end

Loading…
Cancel
Save