diff options
author | Kamil TrzciĆski <ayufan@ayufan.eu> | 2017-03-24 12:03:11 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-24 18:04:51 +0300 |
commit | a3ba0466ae984e6bc88e887e50cd1c76e6c16cb7 (patch) | |
tree | 1ae5321431858b8b69cb7f697d6f650dc1135862 /lib | |
parent | 671e345f7c33cddd58564e76f11c7fd149b93ac1 (diff) |
Merge branch 'fix-ci-api-regression-for-after-script' into 'master'
Fix after_script processing for Runners APIv4
See merge request !10185
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ci/build/step.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/lib/gitlab/ci/build/step.rb b/lib/gitlab/ci/build/step.rb index 1877429ac46..ee034d9cc56 100644 --- a/lib/gitlab/ci/build/step.rb +++ b/lib/gitlab/ci/build/step.rb @@ -7,13 +7,12 @@ module Gitlab WHEN_ALWAYS = 'always'.freeze attr_reader :name - attr_writer :script - attr_accessor :timeout, :when, :allow_failure + attr_accessor :script, :timeout, :when, :allow_failure class << self def from_commands(job) self.new(:script).tap do |step| - step.script = job.commands + step.script = job.commands.split("\n") step.timeout = job.timeout step.when = WHEN_ON_SUCCESS end @@ -36,10 +35,6 @@ module Gitlab @name = name @allow_failure = false end - - def script - @script.split("\n") - end end end end |