diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2020-09-08 17:58:32 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-21 15:13:04 +0000 |
| commit | 0fcb8b33c573914540e1ef46b6c508c05be87462 (patch) | |
| tree | 606aee61806288dbddc90470b26157470f440503 /.gitlab-ci.yml | |
| parent | b47f1bbff98ef94db4eccdbff987bb12836e6881 (diff) | |
ci: Add "is pre-merge pipeline" YAML anchor
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6566>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 729a1f41c7b..c4cc6886190 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,6 +59,9 @@ stages: # Post-merge pipeline, not for Marge Bot - if: &is-post-merge-not-for-marge '$GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME && $CI_PROJECT_PATH == "mesa/mesa"' when: on_success + # Pre-merge pipeline + - if: &is-pre-merge '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + when: on_success # Pre-merge pipeline for Marge Bot - if: &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' when: on_success @@ -151,7 +154,7 @@ success: when: never - changes: *all_paths when: never - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + - if: *is-pre-merge when: on_success variables: GIT_STRATEGY: none |