Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1f320edb
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1f320edb
编写于
6月 23, 2016
作者:
G
Grzegorz Bizon
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor refactorings in new CI configuration classes
上级
29b96d92
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
6 deletion
+10
-6
lib/ci/gitlab_ci_yaml_processor.rb
lib/ci/gitlab_ci_yaml_processor.rb
+5
-0
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
+1
-2
lib/gitlab/ci/config/node/validator.rb
lib/gitlab/ci/config/node/validator.rb
+1
-1
spec/lib/gitlab/ci/config/node/validator_spec.rb
spec/lib/gitlab/ci/config/node/validator_spec.rb
+2
-2
未找到文件。
lib/ci/gitlab_ci_yaml_processor.rb
浏览文件 @
1f320edb
...
...
@@ -91,6 +91,11 @@ module Ci
{
stage_idx:
@stages
.
index
(
job
[
:stage
]),
stage:
job
[
:stage
],
##
# Refactoring note:
# - before script behaves differently than after script
# - after script returns an array of commands
# - before script should be a concatenated command
commands:
[
job
[
:before_script
]
||
@before_script
,
job
[
:script
]].
flatten
.
compact
.
join
(
"
\n
"
),
tag_list:
job
[
:tags
]
||
[],
name:
name
,
...
...
lib/gitlab/ci/config/node/configurable.rb
浏览文件 @
1f320edb
...
...
@@ -52,7 +52,7 @@ module Gitlab
factory
=
Node
::
Factory
.
new
(
entry_class
)
.
with
(
description:
metadata
[
:description
])
(
@nodes
||=
{}).
merge!
(
symbol
=>
factory
)
(
@nodes
||=
{}).
merge!
(
symbol
.
to_sym
=>
factory
)
end
end
end
...
...
lib/gitlab/ci/config/node/entry.rb
浏览文件 @
1f320edb
...
...
@@ -44,8 +44,7 @@ module Gitlab
end
def
errors
@validator
.
full_errors
+
nodes
.
map
(
&
:errors
).
flatten
@validator
.
messages
+
nodes
.
flat_map
(
&
:errors
)
end
def
value
...
...
lib/gitlab/ci/config/node/validator.rb
浏览文件 @
1f320edb
...
...
@@ -11,7 +11,7 @@ module Gitlab
@node
=
node
end
def
full_error
s
def
message
s
errors
.
full_messages
.
map
do
|
error
|
"
#{
@node
.
key
}
#{
error
}
"
.
humanize
end
...
...
spec/lib/gitlab/ci/config/node/validator_spec.rb
浏览文件 @
1f320edb
...
...
@@ -19,7 +19,7 @@ describe Gitlab::Ci::Config::Node::Validator do
it
'returns no errors'
do
validator_instance
.
validate
expect
(
validator_instance
.
full_error
s
).
to
be_empty
expect
(
validator_instance
.
message
s
).
to
be_empty
end
end
...
...
@@ -36,7 +36,7 @@ describe Gitlab::Ci::Config::Node::Validator do
it
'returns errors'
do
validator_instance
.
validate
expect
(
validator_instance
.
full_error
s
).
not_to
be_empty
expect
(
validator_instance
.
message
s
).
not_to
be_empty
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录