Fix handling of skipped vs success status
This commit is contained in:
parent
13cee6d7fc
commit
6d80b94a89
|
@ -4,7 +4,7 @@ module HasStatus
|
|||
AVAILABLE_STATUSES = %w[created pending running success failed canceled skipped]
|
||||
STARTED_STATUSES = %w[running success failed skipped]
|
||||
ACTIVE_STATUSES = %w[pending running]
|
||||
COMPLETED_STATUSES = %w[success failed canceled]
|
||||
COMPLETED_STATUSES = %w[success failed canceled skipped]
|
||||
ORDERED_STATUSES = %w[failed pending running canceled success skipped]
|
||||
|
||||
class_methods do
|
||||
|
@ -23,9 +23,9 @@ module HasStatus
|
|||
canceled = scope.canceled.select('count(*)').to_sql
|
||||
|
||||
"(CASE
|
||||
WHEN (#{builds})=(#{success}) THEN 'success'
|
||||
WHEN (#{builds})=(#{skipped}) THEN 'skipped'
|
||||
WHEN (#{builds})=(#{created}) THEN 'created'
|
||||
WHEN (#{builds})=(#{success})+(#{skipped}) THEN 'skipped'
|
||||
WHEN (#{builds})=(#{success})+(#{skipped}) THEN 'success'
|
||||
WHEN (#{builds})=(#{success})+(#{skipped})+(#{canceled}) THEN 'canceled'
|
||||
WHEN (#{builds})=(#{created})+(#{skipped})+(#{pending}) THEN 'pending'
|
||||
WHEN (#{running})+(#{pending})+(#{created})>0 THEN 'running'
|
||||
|
|
|
@ -44,11 +44,11 @@ module Ci
|
|||
def valid_statuses_for_when(value)
|
||||
case value
|
||||
when 'on_success'
|
||||
%w[success]
|
||||
%w[success skipped]
|
||||
when 'on_failure'
|
||||
%w[failed]
|
||||
when 'always'
|
||||
%w[success failed]
|
||||
%w[success failed skipped]
|
||||
else
|
||||
[]
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue