diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/ci/build.rb | 8 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 3 | ||||
| -rw-r--r-- | app/models/commit_status.rb | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 48a49ef203e..05b11f3b115 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -70,14 +70,6 @@ module Ci build.execute_hooks end - # We use around_transition to create builds for next stage as soon as possible, before the `after_*` is executed - around_transition any => [:success, :failed, :canceled] do |build, block| - block.call - if build.pipeline - build.pipeline.process! - end - end - after_transition any => [:success, :failed, :canceled] do |build| build.update_coverage build.execute_hooks diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 5c85578bdf3..c1417903590 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -90,12 +90,14 @@ module Ci def cancel_running builds.running_or_pending.each(&:cancel) + reload_status! end def retry_failed(user) builds.latest.failed.select(&:retryable?).each do |build| Ci::Build.retry(build, user) end + reload_status! end def latest? @@ -182,7 +184,6 @@ module Ci def process! Ci::ProcessPipelineService.new(project, user).execute(self) - reload_status! end def predefined_variables diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index 79e038b6a78..9c730904ba3 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -70,9 +70,12 @@ class CommitStatus < ActiveRecord::Base MergeRequests::AddTodoWhenBuildFailsService.new(commit_status.pipeline.project, nil).execute(commit_status) end - after_transition any => [:success, :failed, :canceled] do |commit_status| + # We use around_transition to process pipeline on next stages as soon as possible, before the `after_*` is executed + around_transition any => [:success, :failed, :canceled] do |commit_status, block| + block.call if commit_status.pipeline commit_status.pipeline.process! + commit_status.pipeline.reload_status! end end end |