diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2019-01-09 19:00:23 +0300 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2019-01-09 19:00:23 +0300 |
| commit | 8cf4fed13bebe168997b69771ea26c47b8fc1b16 (patch) | |
| tree | d1231a0bb657ebcb41d414b558e9f3c7d653835c /lib | |
| parent | ebdf9fada7b2f02301b259160b69c6a2750a713a (diff) | |
Handler regular deps next to parallelized job deps
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/config/normalizer.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/normalizer.rb b/lib/gitlab/ci/config/normalizer.rb index b7743bd2090..191f5d09645 100644 --- a/lib/gitlab/ci/config/normalizer.rb +++ b/lib/gitlab/ci/config/normalizer.rb @@ -46,7 +46,8 @@ module Gitlab parallelized_job_names = @parallelized_jobs.keys.map(&:to_s) parallelized_config.each_with_object({}) do |(job_name, config), hash| if config[:dependencies] && (intersection = config[:dependencies] & parallelized_job_names).any? - deps = intersection.map { |dep| @parallelized_jobs[dep.to_sym].map(&:first) }.flatten + parallelized_deps = intersection.map { |dep| @parallelized_jobs[dep.to_sym].map(&:first) }.flatten + deps = config[:dependencies] - intersection + parallelized_deps hash[job_name] = config.merge(dependencies: deps) else hash[job_name] = config |