aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorEric Engestrom <eric@igalia.com>2023-10-26 17:36:30 +0100
committerMarge Bot <emma+marge@anholt.net>2023-10-30 17:50:56 +0000
commitfac60c140ba57ceebbdcd5278812fe4fa9f737df (patch)
treed83a39e0dd0f197e5863d792bd67157c6df830ae /.gitlab-ci.yml
parent49395b4aa4b2e0cf89c52a00ceabd20cf8e7f9d6 (diff)
downloadmesa3d-fac60c140ba57ceebbdcd5278812fe4fa9f737df.tar.gz
ci: don't run sanity in Marge pipelines
This check is intended for the MR author; for everyone else, there's nothing they can do if the job fails so it's pointless to run it. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25920>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d63be7d3770..99163b3e155 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -146,6 +146,8 @@ include:
- &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"'
+ # Pre-merge pipeline *not* for Marge Bot
+ - &is-pre-merge-not-for-marge '$GITLAB_USER_LOGIN != "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"'
.container+build-rules:
@@ -233,7 +235,7 @@ sanity:
- .fdo.ci-fairy
stage: sanity
rules:
- - if: *is-pre-merge
+ - if: *is-pre-merge-not-for-marge
when: on_success
# Other cases default to never
variables: