diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-19 17:38:47 +0100 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-02-19 23:24:31 +0100 |
commit | 56449cc6747224adbf3a55e9ac5d21e24dbbaa30 (patch) | |
tree | 416b5ad971cf562bbfbb42181b9fc39d16ffc1fd /app/models/ci/build.rb | |
parent | 2cc9a42ca45d14fc7fe35ea6f8bc4f9275f33144 (diff) | |
download | gitlab-ce-56449cc6747224adbf3a55e9ac5d21e24dbbaa30.tar.gz |
Fix Merge When Succeeded for multiple stages
Use around_transition to trigger build creation for next stages
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r-- | app/models/ci/build.rb | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5d800cd1f85..1227458e525 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -107,15 +107,18 @@ module Ci end state_machine :status, initial: :pending do - after_transition pending: :running do |build, transition| + after_transition pending: :running do |build| build.execute_hooks end - after_transition any => [:success, :failed, :canceled] do |build, transition| - return unless build.project + # 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 + build.commit.create_next_builds(build) if build.commit + end + after_transition any => [:success, :failed, :canceled] do |build| build.update_coverage - build.commit.create_next_builds(build) build.execute_hooks end end @@ -179,6 +182,7 @@ module Ci end def update_coverage + return unless project coverage_regex = project.build_coverage_regex return unless coverage_regex coverage = extract_coverage(trace, coverage_regex) @@ -334,6 +338,7 @@ module Ci end def execute_hooks + return unless project build_data = Gitlab::BuildDataBuilder.build(self) project.execute_hooks(build_data.dup, :build_hooks) project.execute_services(build_data.dup, :build_hooks) |