Module: Mesa Branch: main Commit: 680f249c9f3e8ebe2f22257381893a44571d9a01 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=680f249c9f3e8ebe2f22257381893a44571d9a01
Author: Eric Engestrom <e...@igalia.com> Date: Fri Dec 1 12:20:00 2023 +0000 ci: improve comments Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26451> --- .gitlab-ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64a7f7c1659..fe24009dd87 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,8 +196,8 @@ include: - !reference [.disable-farm-mr-rules, rules] # Never run immediately after merging, as we just ran everything - !reference [.never-post-merge-rules, rules] - # Run pipeline by default if it was triggered by Marge Bot, is for a - # merge request, and any files affecting the pipeline were changed + # Build everything in merge pipelines, if any files affecting the pipeline + # were changed - if: *is-merge-attempt changes: &all_paths - VERSION @@ -224,8 +224,8 @@ include: changes: *all_paths when: manual - # Just skip everything for MRs which don't actually change anything in the - # build - the same rules as above, but without the file-change rules + # Skip everything for pre-merge and merge pipelines which don't change + # anything in the build - if: *is-merge-attempt when: never - if: *is-pre-merge @@ -236,7 +236,8 @@ include: # Build everything in scheduled pipelines - if: *is-scheduled-pipeline when: on_success - # Always allow user branches etc to trigger jobs manually + # Allow building everything in fork pipelines, but build nothing unless + # manually triggered - when: manual
