Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
3878a774
Commit
3878a774
authored
Mar 23, 2017
by
Tomasz Maczukin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix after_script processing for Runners APIv4
parent
22682f6e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
changelogs/unreleased/fix-ci-api-regression-for-after-script.yml
...ogs/unreleased/fix-ci-api-regression-for-after-script.yml
+4
-0
lib/gitlab/ci/build/step.rb
lib/gitlab/ci/build/step.rb
+2
-7
spec/factories/ci/builds.rb
spec/factories/ci/builds.rb
+1
-1
spec/lib/gitlab/ci/build/step_spec.rb
spec/lib/gitlab/ci/build/step_spec.rb
+1
-1
No files found.
changelogs/unreleased/fix-ci-api-regression-for-after-script.yml
0 → 100644
View file @
3878a774
---
title
:
Fix after_script processing for Runners APIv4
merge_request
:
10185
author
:
lib/gitlab/ci/build/step.rb
View file @
3878a774
...
@@ -7,13 +7,12 @@ module Gitlab
...
@@ -7,13 +7,12 @@ module Gitlab
WHEN_ALWAYS
=
'always'
.
freeze
WHEN_ALWAYS
=
'always'
.
freeze
attr_reader
:name
attr_reader
:name
attr_writer
:script
attr_accessor
:script
,
:timeout
,
:when
,
:allow_failure
attr_accessor
:timeout
,
:when
,
:allow_failure
class
<<
self
class
<<
self
def
from_commands
(
job
)
def
from_commands
(
job
)
self
.
new
(
:script
).
tap
do
|
step
|
self
.
new
(
:script
).
tap
do
|
step
|
step
.
script
=
job
.
commands
step
.
script
=
job
.
commands
.
split
(
"
\n
"
)
step
.
timeout
=
job
.
timeout
step
.
timeout
=
job
.
timeout
step
.
when
=
WHEN_ON_SUCCESS
step
.
when
=
WHEN_ON_SUCCESS
end
end
...
@@ -36,10 +35,6 @@ module Gitlab
...
@@ -36,10 +35,6 @@ module Gitlab
@name
=
name
@name
=
name
@allow_failure
=
false
@allow_failure
=
false
end
end
def
script
@script
.
split
(
"
\n
"
)
end
end
end
end
end
end
end
...
...
spec/factories/ci/builds.rb
View file @
3878a774
...
@@ -172,7 +172,7 @@ FactoryGirl.define do
...
@@ -172,7 +172,7 @@ FactoryGirl.define do
{
{
image:
'ruby:2.1'
,
image:
'ruby:2.1'
,
services:
[
'postgres'
],
services:
[
'postgres'
],
after_script:
"ls
\n
date"
,
after_script:
%w(ls date)
,
artifacts:
{
artifacts:
{
name:
'artifacts_file'
,
name:
'artifacts_file'
,
untracked:
false
,
untracked:
false
,
...
...
spec/lib/gitlab/ci/build/step_spec.rb
View file @
3878a774
...
@@ -25,7 +25,7 @@ describe Gitlab::Ci::Build::Step do
...
@@ -25,7 +25,7 @@ describe Gitlab::Ci::Build::Step do
end
end
context
'when after_script is not empty'
do
context
'when after_script is not empty'
do
let
(
:job
)
{
create
(
:ci_build
,
options:
{
after_script:
"ls -la
\n
date"
})
}
let
(
:job
)
{
create
(
:ci_build
,
options:
{
after_script:
[
'ls -la'
,
'date'
]
})
}
it
'fabricates an object'
do
it
'fabricates an object'
do
expect
(
subject
.
name
).
to
eq
(
:after_script
)
expect
(
subject
.
name
).
to
eq
(
:after_script
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment