Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
86944cb9
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,发现更多精彩内容 >>
提交
86944cb9
编写于
12月 15, 2019
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@master
上级
d5e16807
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
8 deletion
+12
-8
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+1
-0
lib/gitlab/ci/config/entry/default.rb
lib/gitlab/ci/config/entry/default.rb
+6
-3
lib/gitlab/ci/config/entry/job.rb
lib/gitlab/ci/config/entry/job.rb
+4
-4
spec/lib/gitlab/ci/config/entry/default_spec.rb
spec/lib/gitlab/ci/config/entry/default_spec.rb
+1
-1
未找到文件。
doc/ci/yaml/README.md
浏览文件 @
86944cb9
...
...
@@ -137,6 +137,7 @@ The following job parameters can be defined inside a `default:` block:
-
[
`after_script`
](
#before_script-and-after_script
)
-
[
`tags`
](
#tags
)
-
[
`cache`
](
#cache
)
-
[
`artifacts`
](
#artifacts
)
-
[
`retry`
](
#retry
)
-
[
`timeout`
](
#timeout
)
-
[
`interruptible`
](
#interruptible
)
...
...
lib/gitlab/ci/config/entry/default.rb
浏览文件 @
86944cb9
...
...
@@ -15,7 +15,7 @@ module Gitlab
ALLOWED_KEYS
=
%i[before_script image services
after_script cache interruptible
timeout retry tags]
.
freeze
timeout retry tags
artifacts
]
.
freeze
validations
do
validates
:config
,
allowed_keys:
ALLOWED_KEYS
...
...
@@ -57,8 +57,11 @@ module Gitlab
description:
'Set the default tags.'
,
inherit:
false
helpers
:before_script
,
:image
,
:services
,
:after_script
,
:cache
,
:interruptible
,
:timeout
,
:retry
,
:tags
entry
:artifacts
,
Entry
::
Artifacts
,
description:
'Default artifacts.'
,
inherit:
false
helpers
:before_script
,
:image
,
:services
,
:after_script
,
:cache
private
...
...
lib/gitlab/ci/config/entry/job.rb
浏览文件 @
86944cb9
...
...
@@ -114,6 +114,10 @@ module Gitlab
description:
'Set the tags.'
,
inherit:
true
entry
:artifacts
,
Entry
::
Artifacts
,
description:
'Artifacts configuration for this job.'
,
inherit:
true
entry
:only
,
Entry
::
Policy
,
description:
'Refs policy this job will be executed for.'
,
default:
Entry
::
Policy
::
DEFAULT_ONLY
,
...
...
@@ -139,10 +143,6 @@ module Gitlab
description:
'Environment variables available for this job.'
,
inherit:
false
entry
:artifacts
,
Entry
::
Artifacts
,
description:
'Artifacts configuration for this job.'
,
inherit:
false
entry
:environment
,
Entry
::
Environment
,
description:
'Environment configuration for this job.'
,
inherit:
false
...
...
spec/lib/gitlab/ci/config/entry/default_spec.rb
浏览文件 @
86944cb9
...
...
@@ -27,7 +27,7 @@ describe Gitlab::Ci::Config::Entry::Default do
expect
(
described_class
.
nodes
.
keys
)
.
to
match_array
(
%i[before_script image services
after_script cache interruptible
timeout retry tags]
)
timeout retry tags
artifacts
]
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录