From 719155c967000a8231811684711c275ce1ddfd60 Mon Sep 17 00:00:00 2001 From: Marcel Amirault Date: Sat, 4 Mar 2023 15:13:08 +0900 Subject: [PATCH 1/3] Update details about nested includes --- doc/ci/yaml/index.md | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index 2bef3abf03010d..e75f8182cfd0a9 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -136,11 +136,17 @@ The `include` files are: - Always evaluated first and then merged with the content of the `.gitlab-ci.yml` file, regardless of the position of the `include` keyword. -You can [nest](includes.md#use-nested-includes) up to 100 includes. In [GitLab 14.9 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/28987), -the same file can be included multiple times in nested includes, but duplicates are ignored. +You can [nest](includes.md#use-nested-includes) includes: -In [GitLab 12.4 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/28212), -the time limit to resolve all files is 30 seconds. +- In [GitLab 15.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/367150) you can nest up to 150 includes. + The same file can be included multiple times in nested includes, but duplicates + are counted against the limit. +- From [GitLab 14.9 to GitLab 15.9](https://gitlab.com/gitlab-org/gitlab/-/issues/28987), you can nest up to 100 includes. + The same file can be included multiple times in nested includes, but duplicates are ignored. +- In GitLab 14.9 and earlier you can nest up to 100 includes, but the same file can not + be included multiple times in nested includes. + +The time limit to resolve all files is 30 seconds. **Keyword type**: Global keyword. -- GitLab From 99174ea46d4391e0f2d59e9fd68424fa53a7de8d Mon Sep 17 00:00:00 2001 From: Catherine Pope Date: Wed, 8 Mar 2023 11:02:19 +0000 Subject: [PATCH 2/3] Apply 2 suggestion(s) to 1 file(s) --- doc/ci/yaml/index.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index e75f8182cfd0a9..52026ad5001619 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -139,12 +139,12 @@ The `include` files are: You can [nest](includes.md#use-nested-includes) includes: - In [GitLab 15.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/367150) you can nest up to 150 includes. - The same file can be included multiple times in nested includes, but duplicates - are counted against the limit. + In nested includes, the same file can be included multiple times, but duplicated includes + count towards the limit. - From [GitLab 14.9 to GitLab 15.9](https://gitlab.com/gitlab-org/gitlab/-/issues/28987), you can nest up to 100 includes. The same file can be included multiple times in nested includes, but duplicates are ignored. - In GitLab 14.9 and earlier you can nest up to 100 includes, but the same file can not - be included multiple times in nested includes. + be included multiple times. The time limit to resolve all files is 30 seconds. -- GitLab From 86891667688b3a11a44023d5f98b9133d5a6b41e Mon Sep 17 00:00:00 2001 From: Marcel Amirault Date: Fri, 10 Mar 2023 10:48:16 +0000 Subject: [PATCH 3/3] Apply 1 suggestion(s) to 1 file(s) --- doc/ci/yaml/index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index 52026ad5001619..02350cf0d21356 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -136,14 +136,14 @@ The `include` files are: - Always evaluated first and then merged with the content of the `.gitlab-ci.yml` file, regardless of the position of the `include` keyword. -You can [nest](includes.md#use-nested-includes) includes: +You can have up to 150 includes per pipeline, including [nested](includes.md#use-nested-includes) includes: -- In [GitLab 15.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/367150) you can nest up to 150 includes. +- In [GitLab 15.10 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/367150) you can have up to 150 includes. In nested includes, the same file can be included multiple times, but duplicated includes count towards the limit. -- From [GitLab 14.9 to GitLab 15.9](https://gitlab.com/gitlab-org/gitlab/-/issues/28987), you can nest up to 100 includes. +- From [GitLab 14.9 to GitLab 15.9](https://gitlab.com/gitlab-org/gitlab/-/issues/28987), you can have up to 100 includes. The same file can be included multiple times in nested includes, but duplicates are ignored. -- In GitLab 14.9 and earlier you can nest up to 100 includes, but the same file can not +- In GitLab 14.9 and earlier you can have up to 100 includes, but the same file can not be included multiple times. The time limit to resolve all files is 30 seconds. -- GitLab