pipeline fix

This commit is contained in:
2026-08-06 16:04:50 +02:00
parent 248ca2ebea
commit 91c31e05bc
4 changed files with 39 additions and 22 deletions
@@ -7,7 +7,7 @@ module WarpEngine
def dashboard
CiRepository.active.includes(:software).map do |repo|
pipeline = begin
@client.latest_pipeline(repo.repo_owner, repo.repo_name)
@client.latest_pipeline(repo.woodpecker_repo_id)
rescue WoodpeckerClient::ApiError
nil
end
@@ -24,15 +24,15 @@ module WarpEngine
end
def trigger(repo, branch: "main")
@client.trigger_pipeline(repo.repo_owner, repo.repo_name, branch: branch)
@client.trigger_pipeline(repo.woodpecker_repo_id, branch: branch)
end
def list_pipelines(repo, page: 1)
@client.list_pipelines(repo.repo_owner, repo.repo_name, page: page)
@client.list_pipelines(repo.woodpecker_repo_id, page: page)
end
def pipeline_detail(repo, number)
@client.get_pipeline(repo.repo_owner, repo.repo_name, number)
@client.get_pipeline(repo.woodpecker_repo_id, number)
end
end
end
+18 -9
View File
@@ -61,21 +61,21 @@ module WarpEngine
# --- Pipelines ---
def list_pipelines(owner, repo_name, page: 1, per_page: 25)
get("/api/repos/#{owner}/#{repo_name}/pipelines",
def list_pipelines(repo_id, page: 1, per_page: 25)
get("/api/repos/#{repo_id}/pipelines",
params: { page: page, perPage: per_page })
end
def latest_pipeline(owner, repo_name)
get("/api/repos/#{owner}/#{repo_name}/pipelines/latest")
def latest_pipeline(repo_id)
get("/api/repos/#{repo_id}/pipelines/latest")
end
def get_pipeline(owner, repo_name, number)
get("/api/repos/#{owner}/#{repo_name}/pipelines/#{number}")
def get_pipeline(repo_id, number)
get("/api/repos/#{repo_id}/pipelines/#{number}")
end
def trigger_pipeline(owner, repo_name, branch: "main")
post("/api/repos/#{owner}/#{repo_name}/pipelines",
def trigger_pipeline(repo_id, branch: "main")
post("/api/repos/#{repo_id}/pipelines",
body: { branch: branch })
end
@@ -136,7 +136,16 @@ module WarpEngine
case response
when Net::HTTPSuccess, Net::HTTPNoContent
return nil if response.body.blank?
JSON.parse(response.body)
begin
JSON.parse(response.body)
rescue JSON::ParserError
# A wrong path falls through to the Woodpecker SPA, which answers
# 200 with index.html — surface that as an API error, not a parse one.
raise ApiError.new(
"Expected JSON from #{uri.path} but got: #{response.body.truncate(80)}",
status: response.code.to_i, body: response.body
)
end
when Net::HTTPNotFound
raise ApiError.new("Not found: #{uri.path}", status: 404, body: response.body)
else