NeroReflex/mesa
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ci: restore sanity (aka. Revert "ci: don't run sanity in Marge pipelines")

Browse source 
This reverts commit fac60c140b.

Turns out there are pipelines that do not create any other jobs, and
Marge requires a pipeline to pass, which means a pipeline needs to
exist, which means a job needs to always exist.

There is no reason `sanity` would be the one, but it's there so let's
just use it instead of making another one.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26080>
This commit is contained in:
Eric Engestrom 2023-11-06 18:45:51 +00:00 • committed by Marge Bot
parent ab87831ae8
commit a4597777fe
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -148,8 +148,6 @@ include:
- &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"' - &is-pre-merge '$CI_PIPELINE_SOURCE == "merge_request_event"'
# Pre-merge pipeline for Marge Bot # Pre-merge pipeline for Marge Bot
- &is-pre-merge-for-marge '$GITLAB_USER_LOGIN == "marge-bot" && $CI_PIPELINE_SOURCE == "merge_request_event"' - &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"'
.never-post-merge-rules: .never-post-merge-rules:
@ -247,7 +245,7 @@ sanity:
- .fdo.ci-fairy - .fdo.ci-fairy
stage: sanity stage: sanity
rules: rules:
- if: *is-pre-merge-not-for-marge - if: *is-pre-merge
when: on_success when: on_success
# Other cases default to never # Other cases default to never
variables: variables: