Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2b907f61
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,体验更适合开发者的 AI 搜索 >>
提交
2b907f61
编写于
11月 18, 2015
作者:
K
Kamil Trzcinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Commits without .gitlab-ci.yml are marked as skipped
- Save detailed error when YAML syntax
上级
a42d469a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
3 deletion
+28
-3
app/models/ci/commit.rb
app/models/ci/commit.rb
+4
-1
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+5
-1
spec/services/ci/create_commit_service_spec.rb
spec/services/ci/create_commit_service_spec.rb
+19
-1
未找到文件。
app/models/ci/commit.rb
浏览文件 @
2b907f61
...
...
@@ -188,12 +188,15 @@ module Ci
end
def
config_processor
return
nil
unless
ci_yaml_file
@config_processor
||=
Ci
::
GitlabCiYamlProcessor
.
new
(
ci_yaml_file
,
gl_project
.
path_with_namespace
)
rescue
Ci
::
GitlabCiYamlProcessor
::
ValidationError
=>
e
save_yaml_error
(
e
.
message
)
nil
rescue
Psych
::
SyntaxError
=>
e
save_yaml_error
(
e
.
message
)
nil
rescue
Exception
=>
e
logger
.
error
e
.
message
+
"
\n
"
+
e
.
backtrace
.
join
(
"
\n
"
)
save_yaml_error
(
"Undefined yaml error"
)
nil
end
...
...
spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
浏览文件 @
2b907f61
...
...
@@ -425,8 +425,12 @@ module Ci
end
describe
"Error handling"
do
it
"fails to parse YAML"
do
expect
{
GitlabCiYamlProcessor
.
new
(
"invalid: yaml: test"
)}.
to
raise_error
(
Psych
::
SyntaxError
)
end
it
"indicates that object is invalid"
do
expect
{
GitlabCiYamlProcessor
.
new
(
"invalid_yaml
\n
!ccdvlf%612334@@@@
"
)}.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
)
expect
{
GitlabCiYamlProcessor
.
new
(
"invalid_yaml"
)}.
to
raise_error
(
GitlabCiYamlProcessor
::
ValidationError
)
end
it
"returns errors if tags parameter is invalid"
do
...
...
spec/services/ci/create_commit_service_spec.rb
浏览文件 @
2b907f61
...
...
@@ -100,7 +100,7 @@ module Ci
end
it
"skips builds creation if there is [ci skip] tag in commit message and yaml is invalid"
do
stub_ci_commit_yaml_file
(
'invalid: file'
)
stub_ci_commit_yaml_file
(
'invalid: file
: fiile
'
)
commits
=
[{
message:
message
}]
commit
=
service
.
execute
(
project
,
user
,
ref:
'refs/tags/0_1'
,
...
...
@@ -110,6 +110,24 @@ module Ci
)
expect
(
commit
.
builds
.
any?
).
to
be
false
expect
(
commit
.
status
).
to
eq
(
"skipped"
)
expect
(
commit
.
yaml_errors
).
to
be_nil
end
end
describe
:config_processor
do
it
"skips builds creation if yaml is invalid"
do
allow_any_instance_of
(
Ci
::
Commit
).
to
receive
(
:git_commit_message
)
{
"message"
}
stub_ci_commit_yaml_file
(
'invalid: file: file'
)
commits
=
[{
message:
message
}]
commit
=
service
.
execute
(
project
,
user
,
ref:
'refs/tags/0_1'
,
before:
'00000000'
,
after:
'31das312'
,
commits:
commits
)
expect
(
commit
.
builds
.
any?
).
to
be
false
expect
(
commit
.
status
).
to
eq
(
"skipped"
)
expect
(
commit
.
yaml_errors
).
to_not
be_nil
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录