Support the branch option for cc.xml requests.

Fixes travis-ci/travis-ci#2090
This commit is contained in:
Mathias Meyer 2014-06-18 10:55:36 +02:00
parent 25f135774c
commit 3f16100247

View File

@ -9,10 +9,10 @@ module Travis::Api::App::Responders
<% @resource.each do |r| %> <% @resource.each do |r| %>
<Project <Project
name="<%= r.slug %>" name="<%= r.slug %>"
activity="<%= ACTIVITY[r.last_build.state.to_sym] || ACTIVITY[:default] %>" activity="<%= ACTIVITY[r.last_completed_build(branch).state.to_sym] || ACTIVITY[:default] %>"
lastBuildStatus="<%= STATUS[r.last_build.state.to_sym] || STATUS[:default] %>" lastBuildStatus="<%= STATUS[r.last_completed_build(branch).state.to_sym] || STATUS[:default] %>"
lastBuildLabel="<%= r.last_build.try(:number) %>" lastBuildLabel="<%= r.last_completed_build(branch).try(:number) %>"
lastBuildTime="<%= r.last_build.finished_at.try(:strftime, '%Y-%m-%dT%H:%M:%S.%L%z') %>" lastBuildTime="<%= r.last_completed_build(branch).finished_at.try(:strftime, '%Y-%m-%dT%H:%M:%S.%L%z') %>"
webUrl="https://<%= Travis.config.client_domain %>/<%= r.slug %>" /> webUrl="https://<%= Travis.config.client_domain %>/<%= r.slug %>" />
<% end %> <% end %>
</Projects> </Projects>
@ -23,7 +23,7 @@ module Travis::Api::App::Responders
passed: 'Success', passed: 'Success',
failed: 'Failure', failed: 'Failure',
errored: 'Error', errored: 'Error',
canceld: 'Canceled', canceled: 'Canceled',
} }
ACTIVITY = { ACTIVITY = {
@ -42,6 +42,10 @@ module Travis::Api::App::Responders
TEMPLATE_ERB.result(binding) TEMPLATE_ERB.result(binding)
end end
def branch
params[:branch].present? ? params[:branch] : master
end
private private
def content_type def content_type