Module: Mesa Branch: main Commit: 7f05f52f2d5f69f36635a719880529a03ac0f4c9 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7f05f52f2d5f69f36635a719880529a03ac0f4c9
Author: Eric Engestrom <[email protected]> Date: Tue Nov 14 16:00:57 2023 +0000 ci: identify merge request pipelines using `$CI_PIPELINE_SOURCE == merge_request_event` instead of `$CI_COMMIT_BRANCH` being missing Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26451> --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec9d856f77b..56b643826e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ workflow: - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS && $CI_PIPELINE_SOURCE == "push" when: never # merge pipeline - - if: $GITLAB_USER_LOGIN == "marge-bot" && $CI_COMMIT_BRANCH == null + - if: &is-pre-merge-for-marge $GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event" variables: KERNEL_IMAGE_BASE: https://${S3_HOST}/mesa-lava/${KERNEL_REPO}/${KERNEL_TAG} MESA_CI_PERFORMANCE_ENABLED: 1 @@ -176,8 +176,6 @@ include: - &is-post-merge-not-for-marge '$CI_PROJECT_NAMESPACE == "mesa" && $GITLAB_USER_LOGIN != "marge-bot" && $CI_COMMIT_BRANCH' # Pre-merge pipeline - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"' - # Pre-merge pipeline for Marge Bot - - &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"' .never-post-merge-rules:
