diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dbe5bab61e..46d51f3b574 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,11 @@ workflow: # Note: 0 = infinity = gitlab's job `timeout:` applies, which is 1h BUILD_JOB_TIMEOUT_OVERRIDE: 0 # pipeline for direct pushes that bypassed the CI - - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot" + - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH + variables: + JOB_PRIORITY: 70 + # pipeline for direct pushes from release maintainer + - if: &is-staging-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_REF_NAME =~ /^staging\// variables: JOB_PRIORITY: 70 diff --git a/.pick_status.json b/.pick_status.json index 5a4e5b2d8b1..da2c71673d3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -934,7 +934,7 @@ "description": "ci: only trigger the CI for release managers when pushing to staging branch", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null