fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 05:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: fix priority of nightly pipeline & staging pipeline jobs
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
The workflow rules added in 7bfb51a7e6 catch the `if` ladder too early and
bypass the `is-scheduled-pipeline`, `is-push-to-upstream-default-branch`,
and `is-push-to-upstream-staging-branch` rules setting the correct job
priority.

Fixes: 7bfb51a7e6 ("ci: Fix missing pipelines on user pipelines in MRs")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35501>
This commit is contained in:
Eric Engestrom 2025-07-15 20:55:54 +02:00 • committed by Marge Bot
parent ea742877f6
commit 7544aae77c
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci.yml
View file

@ -55,11 +55,6 @@ workflow:
- if: &is-merge-request $CI_PIPELINE_SOURCE == "merge_request_event" - if: &is-merge-request $CI_PIPELINE_SOURCE == "merge_request_event"
# Push to a branch on a fork # Push to a branch on a fork
- if: &is-push-to-fork $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push" - if: &is-push-to-fork $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
# a pipeline running within the upstream project
- if: &is-upstream-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO
# an MR pipeline running within the upstream project, usually true for
# those with the Developer role or above
- if: &is-upstream-mr-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO && $CI_PIPELINE_SOURCE == "merge_request_event"
# Nightly pipeline # Nightly pipeline
- if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule" - if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
variables: variables:
@ -265,7 +260,7 @@ include:
when: manual when: manual
# ... if the MR pipeline runs as mesa/mesa and does not need a container # ... if the MR pipeline runs as mesa/mesa and does not need a container
# rebuild, we can skip it # rebuild, we can skip it
- if: *is-upstream-mr-pipeline - if: &is-upstream-mr-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO && $CI_PIPELINE_SOURCE == "merge_request_event"
when: never when: never
# ... however for MRs running inside the user namespace, we may need to # ... however for MRs running inside the user namespace, we may need to
# run these jobs to copy the container images from upstream # run these jobs to copy the container images from upstream
@ -281,7 +276,7 @@ include:
- if: *is-scheduled-pipeline - if: *is-scheduled-pipeline
when: never when: never
# Any other pipeline in the upstream should reuse already-built containers # Any other pipeline in the upstream should reuse already-built containers
- if: *is-upstream-pipeline - if: &is-upstream-pipeline $CI_PROJECT_PATH == $FDO_UPSTREAM_REPO
when: never when: never
# Allow building everything in fork pipelines, but build nothing unless # Allow building everything in fork pipelines, but build nothing unless
# manually triggered # manually triggered