Add latest changes from gitlab-org/gitlab@master

1 files changed, 44 insertions, 66 deletions

diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
index c836630d21c..4c2d6ac30bb 100644
--- a/app/assets/javascripts/editor/schema/ci.json
+++ b/app/assets/javascripts/editor/schema/ci.json
@@ -103,7 +103,9 @@
     "workflow": {
       "type": "object",
       "properties": {
-        "name": { "$ref": "#/definitions/workflowName" },
+        "name": {
+          "$ref": "#/definitions/workflowName"
+        },
         "rules": {
           "type": "array",
           "items": {
@@ -861,98 +863,74 @@
       "markdownDescription": "Describes the conditions for when to run the job. Defaults to 'on_success'. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#when).",
       "default": "on_success",
       "type": "string",
-      "enum": ["on_success", "on_failure", "always", "never", "manual", "delayed"]
+      "enum": [
+        "on_success",
+        "on_failure",
+        "always",
+        "never",
+        "manual",
+        "delayed"
+      ]
     },
     "cache": {
+      "markdownDescription": "Use `cache` to specify a list of files and directories to cache between jobs. You can only use paths that are in the local working copy. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cache)",
       "properties": {
-        "when": {
-          "markdownDescription": "Defines when to save the cache, based on the status of the job. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachewhen).",
-          "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",
-      "description": "Specify files or directories to cache between jobs. Can be set globally or per job.",
-      "additionalProperties": false,
-      "properties": {
-        "paths": {
-          "type": "array",
-          "description": "List of files or paths to cache.",
-          "items": {
-            "type": "string"
-          }
-        },
         "key": {
+          "markdownDescription": "Use the `cache:key` keyword to give each cache a unique identifying key. All jobs that use the same cache key use the same cache, including in different pipelines. Must be used with `cache:path`, or nothing is cached. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachekey).",
           "oneOf": [
             {
               "type": "string",
-              "description": "Unique cache ID, to allow e.g. specific branch or job cache. Environment variables can be used to set up unique keys (e.g. \"$CI_COMMIT_REF_SLUG\" for per branch cache)."
+              "pattern": "^(?!.*\\/)^(.*[^.]+.*)$"
             },
             {
               "type": "object",
-              "description": "When you include cache:key:files, you must also list the project files that will be used to generate the key, up to a maximum of two files. The cache key will be a SHA checksum computed from the most recent commits (up to two, if two files are listed) that changed the given files.",
               "properties": {
                 "files": {
+                  "markdownDescription": "Use the `cache:key:files` keyword to generate a new key when one or two specific files change. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachekeyfiles)",
                   "type": "array",
                   "items": {
                     "type": "string"
                   },
                   "minItems": 1,
                   "maxItems": 2
+                },
+                "prefix": {
+                  "markdownDescription": "Use `cache:key:prefix` to combine a prefix with the SHA computed for `cache:key:files`. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachekeyprefix)",
+                  "type": "string"
                 }
               }
             }
           ]
         },
-        "untracked": {
-          "type": "boolean",
-          "description": "Set to `true` to cache untracked files.",
-          "default": false
+        "paths": {
+          "type": "array",
+          "markdownDescription": "Use the `cache:paths` keyword to choose which files or directories to cache. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachepaths)",
+          "items": {
+            "type": "string"
+          }
         },
         "policy": {
           "type": "string",
-          "description": "Determines the strategy for downloading and updating the cache.",
+          "markdownDescription": "Determines the strategy for downloading and updating the cache. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachepolicy)",
           "default": "pull-push",
-          "oneOf": [
-            {
-              "enum": [
-                "pull"
-              ],
-              "description": "Pull will download cache but skip uploading after job completes."
-            },
-            {
-              "enum": [
-                "push"
-              ],
-              "description": "Push will skip downloading cache and always recreate cache after job completes."
-            },
-            {
-              "enum": [
-                "pull-push"
-              ],
-              "description": "Pull-push will both download cache at job start and upload cache on job success."
-            }
+          "enum": [
+            "pull",
+            "push",
+            "pull-push"
+          ]
+        },
+        "untracked": {
+          "type": "boolean",
+          "markdownDescription": "Use `untracked: true` to cache all files that are untracked in your Git repository. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cacheuntracked)",
+          "default": false
+        },
+        "when": {
+          "markdownDescription": "Defines when to save the cache, based on the status of the job. [Learn More](https://docs.gitlab.com/ee/ci/yaml/#cachewhen).",
+          "default": "on_success",
+          "enum": [
+            "on_success",
+            "on_failure",
+            "always"
           ]
         }
       }