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
Jérome Perrin
gitlab-ce
Commits
a80a01e8
Commit
a80a01e8
authored
Jul 09, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comment for deprecated CI config `types` entry
parent
e9b42067
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+1
-3
lib/gitlab/ci/config/node/global.rb
lib/gitlab/ci/config/node/global.rb
+9
-2
No files found.
lib/ci/gitlab_ci_yaml_processor.rb
View file @
a80a01e8
...
@@ -17,9 +17,7 @@ module Ci
...
@@ -17,9 +17,7 @@ module Ci
def
initialize
(
config
,
path
=
nil
)
def
initialize
(
config
,
path
=
nil
)
@ci_config
=
Gitlab
::
Ci
::
Config
.
new
(
config
)
@ci_config
=
Gitlab
::
Ci
::
Config
.
new
(
config
)
@config
=
@ci_config
.
to_hash
@config
,
@path
=
@ci_config
.
to_hash
,
path
@path
=
path
unless
@ci_config
.
valid?
unless
@ci_config
.
valid?
raise
ValidationError
,
@ci_config
.
errors
.
first
raise
ValidationError
,
@ci_config
.
errors
.
first
...
...
lib/gitlab/ci/config/node/global.rb
View file @
a80a01e8
...
@@ -50,7 +50,7 @@ module Gitlab
...
@@ -50,7 +50,7 @@ module Gitlab
compose_jobs!
compose_jobs!
end
end
def
compose_
stage
s!
def
compose_
job
s!
factory
=
Node
::
Factory
.
new
(
Node
::
Jobs
)
factory
=
Node
::
Factory
.
new
(
Node
::
Jobs
)
factory
.
value
(
@config
.
except
(
*
nodes
.
keys
))
factory
.
value
(
@config
.
except
(
*
nodes
.
keys
))
factory
.
with
(
key: :jobs
,
parent:
self
,
global:
self
)
factory
.
with
(
key: :jobs
,
parent:
self
,
global:
self
)
...
@@ -59,7 +59,14 @@ module Gitlab
...
@@ -59,7 +59,14 @@ module Gitlab
@entries
[
:jobs
]
=
factory
.
create!
@entries
[
:jobs
]
=
factory
.
create!
end
end
def
compose_jobs!
def
compose_stages!
##
# Deprecated `:types` key workaround - if types are defined and
# stages are not defined we use types definition as stages.
#
# Otherwise we use stages in favor of types, and remove types from
# processing.
#
if
types_defined?
&&
!
stages_defined?
if
types_defined?
&&
!
stages_defined?
@entries
[
:stages
]
=
@entries
[
:types
]
@entries
[
:stages
]
=
@entries
[
:types
]
end
end
...
...
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