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
6c704fd9
Commit
6c704fd9
authored
Aug 06, 2016
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Inject dependencies into each CI config entry node
parent
7bbb523b
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
8 deletions
+15
-8
lib/gitlab/ci/config/node/configurable.rb
lib/gitlab/ci/config/node/configurable.rb
+1
-1
lib/gitlab/ci/config/node/entry.rb
lib/gitlab/ci/config/node/entry.rb
+7
-4
lib/gitlab/ci/config/node/global.rb
lib/gitlab/ci/config/node/global.rb
+5
-1
lib/gitlab/ci/config/node/job.rb
lib/gitlab/ci/config/node/job.rb
+1
-1
lib/gitlab/ci/config/node/jobs.rb
lib/gitlab/ci/config/node/jobs.rb
+1
-1
No files found.
lib/gitlab/ci/config/node/configurable.rb
View file @
6c704fd9
...
@@ -25,7 +25,7 @@ module Gitlab
...
@@ -25,7 +25,7 @@ module Gitlab
private
private
def
compose!
def
compose!
(
_deps
)
self
.
class
.
nodes
.
each
do
|
key
,
factory
|
self
.
class
.
nodes
.
each
do
|
key
,
factory
|
factory
factory
.
value
(
@config
[
key
])
.
value
(
@config
[
key
])
...
...
lib/gitlab/ci/config/node/entry.rb
View file @
6c704fd9
...
@@ -20,11 +20,14 @@ module Gitlab
...
@@ -20,11 +20,14 @@ module Gitlab
@validator
.
validate
(
:new
)
@validator
.
validate
(
:new
)
end
end
def
process!
def
process!
(
deps
=
nil
)
return
unless
valid?
return
unless
valid?
compose!
compose!
(
deps
)
descendants
.
each
(
&
:process!
)
descendants
.
each
do
|
entry
|
entry
.
process!
(
deps
)
end
end
end
def
leaf?
def
leaf?
...
@@ -76,7 +79,7 @@ module Gitlab
...
@@ -76,7 +79,7 @@ module Gitlab
private
private
def
compose!
def
compose!
(
_deps
)
end
end
end
end
end
end
...
...
lib/gitlab/ci/config/node/global.rb
View file @
6c704fd9
...
@@ -36,9 +36,13 @@ module Gitlab
...
@@ -36,9 +36,13 @@ module Gitlab
helpers
:before_script
,
:image
,
:services
,
:after_script
,
helpers
:before_script
,
:image
,
:services
,
:after_script
,
:variables
,
:stages
,
:types
,
:cache
,
:jobs
:variables
,
:stages
,
:types
,
:cache
,
:jobs
def
process!
(
_deps
=
nil
)
super
(
self
)
end
private
private
def
compose!
def
compose!
(
_deps
)
super
super
compose_jobs!
compose_jobs!
...
...
lib/gitlab/ci/config/node/job.rb
View file @
6c704fd9
...
@@ -107,7 +107,7 @@ module Gitlab
...
@@ -107,7 +107,7 @@ module Gitlab
after_script:
after_script
}
after_script:
after_script
}
end
end
def
compose!
def
compose!
(
_deps
)
super
super
if
type_defined?
&&
!
stage_defined?
if
type_defined?
&&
!
stage_defined?
...
...
lib/gitlab/ci/config/node/jobs.rb
View file @
6c704fd9
...
@@ -28,7 +28,7 @@ module Gitlab
...
@@ -28,7 +28,7 @@ module Gitlab
private
private
def
compose!
def
compose!
(
_deps
)
@config
.
each
do
|
name
,
config
|
@config
.
each
do
|
name
,
config
|
node
=
hidden?
(
name
)
?
Node
::
HiddenJob
:
Node
::
Job
node
=
hidden?
(
name
)
?
Node
::
HiddenJob
:
Node
::
Job
...
...
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