diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-29 12:11:43 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-29 12:11:43 +0300 |
commit | c724e639a91a4d112b7f0a05b3c6a0ffa6baa7a4 (patch) | |
tree | dccd51e5f480459820f1f908ad22584e8fe8689c /app/assets/javascripts/editor | |
parent | cba55463a02fe6f9c9e8b6ed0b9ed38a0f087342 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/editor')
-rw-r--r-- | app/assets/javascripts/editor/schema/ci.json | 57 |
1 files changed, 45 insertions, 12 deletions
diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json index 04a36953d66..b6473322b1f 100644 --- a/app/assets/javascripts/editor/schema/ci.json +++ b/app/assets/javascripts/editor/schema/ci.json @@ -277,7 +277,8 @@ "type": "string", "format": "uri-reference", "pattern": "\\.ya?ml$" - } + }, + "rules": { "$ref": "#/definitions/rules" } }, "required": ["local"] }, @@ -491,7 +492,7 @@ }, "rules": { "type": "array", - "description": "rules allows for an array of individual rule objects to be evaluated in order, until one matches and dynamically provides attributes to the job.", + "description": "Rules allows for an array of individual rule objects to be evaluated in order, until one matches and dynamically provides attributes to the job.", "items": { "type": "object", "additionalProperties": false, @@ -625,17 +626,26 @@ ] }, "cache": { - "oneOf": [ - { - "$ref": "#/definitions/cache_entry" - }, - { - "type": "array", - "items": { - "$ref": "#/definitions/cache_entry" - } + "properties": { + "when": { + "description": "Defines when to save the cache, based on the status of the job.", + "default": "on_success", + "oneOf": [ + { + "enum": ["on_success"], + "description": "Save the cache only when the job succeeds." + }, + { + "enum": ["on_failure"], + "description": "Save the cache only when the job fails. " + }, + { + "enum": ["always"], + "description": "Always save the cache. " + } + ] } - ] + } }, "cache_entry": { "type": "object", @@ -1320,6 +1330,29 @@ } }, "required": ["artifact", "job"] + }, + { + "type": "object", + "additionalProperties": false, + "properties": { + "project": { + "description": "Path to another private project under the same GitLab instance, like `group/project` or `group/sub-group/project`.", + "type": "string", + "pattern": "\\S/\\S" + }, + "ref": { + "description": "Branch/Tag/Commit hash for the target project.", + "minLength": 1, + "type": "string" + }, + "file": { + "description": "Relative path from repository root (`/`) to the pipeline configuration YAML file.", + "type": "string", + "format": "uri-reference", + "pattern": "\\.ya?ml$" + } + }, + "required": ["project", "file"] } ] } |