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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
8cf4fed1
Commit
8cf4fed1
authored
Jan 09, 2019
by
Matija Čupić
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handler regular deps next to parallelized job deps
parent
ebdf9fad
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
lib/gitlab/ci/config/normalizer.rb
lib/gitlab/ci/config/normalizer.rb
+2
-1
No files found.
lib/gitlab/ci/config/normalizer.rb
View file @
8cf4fed1
...
...
@@ -46,7 +46,8 @@ module Gitlab
parallelized_job_names
=
@parallelized_jobs
.
keys
.
map
(
&
:to_s
)
parallelized_config
.
each_with_object
({})
do
|
(
job_name
,
config
),
hash
|
if
config
[
:dependencies
]
&&
(
intersection
=
config
[
:dependencies
]
&
parallelized_job_names
).
any?
deps
=
intersection
.
map
{
|
dep
|
@parallelized_jobs
[
dep
.
to_sym
].
map
(
&
:first
)
}.
flatten
parallelized_deps
=
intersection
.
map
{
|
dep
|
@parallelized_jobs
[
dep
.
to_sym
].
map
(
&
:first
)
}.
flatten
deps
=
config
[
:dependencies
]
-
intersection
+
parallelized_deps
hash
[
job_name
]
=
config
.
merge
(
dependencies:
deps
)
else
hash
[
job_name
]
=
config
...
...
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