diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-07 14:23:47 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-07 14:23:47 +0200 |
| commit | 70bda3e89bc3828fc8771496ec6d61e41ac3d3ed (patch) | |
| tree | c4b22b60c78ae12040d4aaaf1c0e8e87166df99d /lib/ci/gitlab_ci_yaml_processor.rb | |
| parent | c2d6d61dac2bf04b649c84ab0f4fe98da906c2c4 (diff) | |
| download | gitlab-ce-70bda3e89bc3828fc8771496ec6d61e41ac3d3ed.tar.gz | |
Implement script in Ci config and use in legacy one
Diffstat (limited to 'lib/ci/gitlab_ci_yaml_processor.rb')
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index c2b941a270a..0483e13b098 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -82,7 +82,7 @@ module Ci { stage_idx: stages.index(job[:stage]), stage: job[:stage], - commands: [job[:before_script] || @before_script, job[:script]].flatten.join("\n"), + commands: [job[:before_script] || [@ci_config.before_script], job[:script]].flatten.compact.join("\n"), tag_list: job[:tags] || [], name: name, only: job[:only], |