diff options
author | Rémy Coutable <remy@rymai.me> | 2016-03-23 11:58:12 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-03-23 12:59:29 +0100 |
commit | f45b9bdef0c9f087e260a9ce2f38d225478c4564 (patch) | |
tree | a9b926b6df8548e3ae526be605079e62edcb9694 /lib | |
parent | 83961f97906ff1b76e1499795e55349460a1d3f8 (diff) | |
download | gitlab-ce-f45b9bdef0c9f087e260a9ce2f38d225478c4564.tar.gz |
Merge branch 'fix-build-dependencies' into 'master'
Fix build dependencies, when the dependency is a string
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14485
See merge request !3344
Diffstat (limited to 'lib')
-rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index 2228425076b..b7209c14148 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -242,9 +242,9 @@ module Ci stage_index = stages.index(job[:stage]) job[:dependencies].each do |dependency| - raise ValidationError, "#{name} job: undefined dependency: #{dependency}" unless @jobs[dependency] + raise ValidationError, "#{name} job: undefined dependency: #{dependency}" unless @jobs[dependency.to_sym] - unless stages.index(@jobs[dependency][:stage]) < stage_index + unless stages.index(@jobs[dependency.to_sym][:stage]) < stage_index raise ValidationError, "#{name} job: dependency #{dependency} is not defined in prior stages" end end |