Commit 6a12e9d1 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'sh-workaround-ruby-2-5-3-bug' into 'master'

Work around Ruby 2.5.3 crash when a CI job is selected

See merge request gitlab-org/gitlab-ce!23256
parents 25c71034 b53d3ac8
...@@ -36,7 +36,7 @@ module Ci ...@@ -36,7 +36,7 @@ module Ci
builds = builds.with_any_tags builds = builds.with_any_tags
end end
builds.find do |build| selection = builds.find do |build|
next unless runner.can_pick?(build) next unless runner.can_pick?(build)
begin begin
...@@ -45,7 +45,7 @@ module Ci ...@@ -45,7 +45,7 @@ module Ci
if assign_runner!(build, params) if assign_runner!(build, params)
register_success(build) register_success(build)
return Result.new(build, true) # rubocop:disable Cop/AvoidReturnFromBlocks break build
end end
rescue StateMachines::InvalidTransition, ActiveRecord::StaleObjectError rescue StateMachines::InvalidTransition, ActiveRecord::StaleObjectError
# We are looping to find another build that is not conflicting # We are looping to find another build that is not conflicting
...@@ -61,6 +61,8 @@ module Ci ...@@ -61,6 +61,8 @@ module Ci
end end
end end
return Result.new(selection, true) if selection
register_failure register_failure
Result.new(nil, valid) Result.new(nil, valid)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment