.gitlab-ci.yml: Use main branch for gitlab ci
Reworks: * Fix mesa/mesamaster typo to mesa/mesa main (anholt) * Use $CI_DEFAULT_BRANCH (eric_engestrom) Signed-off-by: Jordan Justen <jordan.l.justen@intel.com> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Engestrom <eric@engestrom.ch>
This commit is contained in:
parent
6e86d1f503
commit
3356488c8a
|
@ -68,8 +68,8 @@ stages:
|
||||||
# Forked project branch / pre-merge pipeline not for Marge bot
|
# Forked project branch / pre-merge pipeline not for Marge bot
|
||||||
- if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME)'
|
- if: &is-forked-branch-or-pre-merge-not-for-marge '$CI_PROJECT_NAMESPACE != "mesa" || ($GITLAB_USER_LOGIN != "marge-bot" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME)'
|
||||||
when: manual
|
when: manual
|
||||||
# Pipeline runs for the master branch of the main project
|
# Pipeline runs for the main branch of the upstream Mesa project
|
||||||
- if: &is-main-master '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == "master" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != "master"'
|
- if: &is-mesa-main '$CI_PROJECT_NAMESPACE == "mesa" && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_DEFAULT_BRANCH'
|
||||||
when: always
|
when: always
|
||||||
# Post-merge pipeline
|
# Post-merge pipeline
|
||||||
- if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
|
- if: &is-post-merge '$CI_PROJECT_NAMESPACE == "mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME'
|
||||||
|
@ -103,7 +103,7 @@ pages:
|
||||||
needs: []
|
needs: []
|
||||||
rules:
|
rules:
|
||||||
- *ignore_scheduled_pipelines
|
- *ignore_scheduled_pipelines
|
||||||
- if: *is-main-master
|
- if: *is-mesa-main
|
||||||
changes: &docs-or-ci
|
changes: &docs-or-ci
|
||||||
- docs/**/*
|
- docs/**/*
|
||||||
- .gitlab-ci.yml
|
- .gitlab-ci.yml
|
||||||
|
@ -1204,7 +1204,7 @@ meson-mingw32-x86_64:
|
||||||
|
|
||||||
# Rules for tests that should not be present in MRs or the main
|
# Rules for tests that should not be present in MRs or the main
|
||||||
# project's pipeline (don't block marge or report red on
|
# project's pipeline (don't block marge or report red on
|
||||||
# mesa/mesamaster) but should be present on pipelines in personal
|
# mesa/mesa main) but should be present on pipelines in personal
|
||||||
# branches (so you can opt in to running the flaky test when you want
|
# branches (so you can opt in to running the flaky test when you want
|
||||||
# to).
|
# to).
|
||||||
.test-manual:
|
.test-manual:
|
||||||
|
|
Loading…
Reference in New Issue