diff options
| author | James Fargher <proglottis@gmail.com> | 2023-01-12 03:29:51 +0300 |
|---|---|---|
| committer | Reuben Pereira <2967854-rpereira2@users.noreply.gitlab.com> | 2023-01-12 12:59:09 +0300 |
| commit | 883319c3053c2d54f2e350c377d52496d17b42bd (patch) | |
| tree | 026edb03650483b185faf21147ee42bc606778ff | |
| parent | cc249c6fd6b6cd331a3cfe52c64dcffcc640e635 (diff) | |
Merge branch 'stable-branch-pipelines' into 'master'
ci: Run pipeline on merge commits to stable branches
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5246
Merged-by: James Fargher <proglottis@gmail.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Approved-by: James Fargher <proglottis@gmail.com>
Reviewed-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: Steve Abrams <sabrams@gitlab.com>
(cherry picked from commit 4e47b5b3766375c6ac7a94cee742c9e9acca39b1)
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0148acd7..d511edea8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,6 @@ variables: TEST_UID: 9999 include: - - template: Workflows/MergeRequest-Pipelines.gitlab-ci.yml - template: Security/License-Scanning.gitlab-ci.yml - template: Security/SAST.gitlab-ci.yml - template: Security/Dependency-Scanning.gitlab-ci.yml @@ -39,6 +38,13 @@ include: file: - '/ci/danger-review.yml' +workflow: + rules: + - if: $CI_MERGE_REQUEST_IID + - if: $CI_COMMIT_TAG + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable$/' + .cache_deps: cache: &cache_deps_configuration key: |