diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-18 09:08:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-18 09:08:14 +0300 |
| commit | 7e5f8d08817c5672a0fe2f36609897f20d7e120e (patch) | |
| tree | c09839c3ea64f6ec1035fdc4942c9022ca5a101a /lib/gitlab/ci/templates/Workflows | |
| parent | 25861ffdce4061974732c8403992a0532433e012 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci/templates/Workflows')
| -rw-r--r-- | lib/gitlab/ci/templates/Workflows/Branch-Pipelines.gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lib/gitlab/ci/templates/Workflows/Branch-Pipelines.gitlab-ci.yml b/lib/gitlab/ci/templates/Workflows/Branch-Pipelines.gitlab-ci.yml new file mode 100644 index 00000000000..05635cf71be --- /dev/null +++ b/lib/gitlab/ci/templates/Workflows/Branch-Pipelines.gitlab-ci.yml @@ -0,0 +1,7 @@ +# Read more on when to use this template at +# https://docs.gitlab.com/ee/ci/yaml/#workflowrules + +workflow: + rules: + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH diff --git a/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml b/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml new file mode 100644 index 00000000000..50ff4c1f60b --- /dev/null +++ b/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml @@ -0,0 +1,8 @@ +# Read more on when to use this template at +# https://docs.gitlab.com/ee/ci/yaml/#workflowrules + +workflow: + rules: + - if: $CI_MERGE_REQUEST_IID + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH |