diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-07-06 16:57:34 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-07-07 14:42:54 +0200 |
| commit | 6d272f8e7d76f891c1db3a8145105004e11eed40 (patch) | |
| tree | 640632253767d756b435030c1da1837bb7269eb3 /lib | |
| parent | d6836a3bc66662618efdd4f86969bdfd0904aca8 (diff) | |
| download | gitlab-ce-pass-before-script-as-is.tar.gz | |
Pass before_script and script as-is preserving arrayspass-before-script-as-is
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/build/step.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb index 56ad2c77c7d..cf3a0336792 100644 --- a/lib/ci/gitlab_ci_yaml_processor.rb +++ b/lib/ci/gitlab_ci_yaml_processor.rb @@ -80,6 +80,8 @@ module Ci artifacts: job[:artifacts], cache: job[:cache], dependencies: job[:dependencies], + before_script: job[:before_script], + script: job[:script], after_script: job[:after_script], environment: job[:environment] }.compact } diff --git a/lib/gitlab/ci/build/step.rb b/lib/gitlab/ci/build/step.rb index ee034d9cc56..411f67f8ce7 100644 --- a/lib/gitlab/ci/build/step.rb +++ b/lib/gitlab/ci/build/step.rb @@ -12,7 +12,8 @@ module Gitlab class << self def from_commands(job) self.new(:script).tap do |step| - step.script = job.commands.split("\n") + step.script = job.options[:before_script].to_a + job.options[:script].to_a + step.script = job.commands.split("\n") if step.script.empty? step.timeout = job.timeout step.when = WHEN_ON_SUCCESS end |