ci: Fix ordering of rules to always build on main
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1141>
This commit is contained in:
parent
57bfb85bc5
commit
eb839a8423
@ -113,13 +113,13 @@ trigger:
|
|||||||
rules:
|
rules:
|
||||||
# If the MR is assigned to the Merge bot, trigger the pipeline automatically
|
# If the MR is assigned to the Merge bot, trigger the pipeline automatically
|
||||||
- if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"'
|
- if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"'
|
||||||
|
# Alway run tests post merged
|
||||||
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
# When the assignee isn't the merge bot, require an explicit action to trigger the pipeline
|
# When the assignee isn't the merge bot, require an explicit action to trigger the pipeline
|
||||||
# to avoid wasting CI resources
|
# to avoid wasting CI resources
|
||||||
- if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"'
|
- if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"'
|
||||||
when: 'manual'
|
when: 'manual'
|
||||||
allow_failure: false
|
allow_failure: false
|
||||||
# Alway run tests post merged
|
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
|
||||||
|
|
||||||
.fedora image:
|
.fedora image:
|
||||||
variables:
|
variables:
|
||||||
@ -341,12 +341,12 @@ gst indent:
|
|||||||
variables:
|
variables:
|
||||||
MESON_ARGS: *simple_build
|
MESON_ARGS: *simple_build
|
||||||
rules:
|
rules:
|
||||||
- changes:
|
|
||||||
*modules_changes
|
|
||||||
# If this matches, it means the pipeline is running against either the main
|
# If this matches, it means the pipeline is running against either the main
|
||||||
# or a stable branch, so make it manual
|
# or a stable branch, so make it manual
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
when: manual
|
when: manual
|
||||||
|
- changes:
|
||||||
|
*modules_changes
|
||||||
|
|
||||||
build nodebug fedora x86_64:
|
build nodebug fedora x86_64:
|
||||||
extends:
|
extends:
|
||||||
@ -393,12 +393,12 @@ build clang fedora x86_64:
|
|||||||
-Dgst-plugins-base:pango=enabled
|
-Dgst-plugins-base:pango=enabled
|
||||||
-Dgst-plugins-good:cairo=enabled
|
-Dgst-plugins-good:cairo=enabled
|
||||||
rules:
|
rules:
|
||||||
- changes:
|
|
||||||
*modules_changes
|
|
||||||
# If this matches, it means the pipeline is running against either the main
|
# If this matches, it means the pipeline is running against either the main
|
||||||
# or a stable branch, so make it manual
|
# or a stable branch, so make it manual
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
when: manual
|
when: manual
|
||||||
|
- changes:
|
||||||
|
*modules_changes
|
||||||
before_script:
|
before_script:
|
||||||
- ci/scripts/handle-subprojects-cache.py subprojects/
|
- ci/scripts/handle-subprojects-cache.py subprojects/
|
||||||
script:
|
script:
|
||||||
@ -536,14 +536,14 @@ gstreamer-full:
|
|||||||
-Dintrospection=disabled
|
-Dintrospection=disabled
|
||||||
$MESON_GST_WERROR
|
$MESON_GST_WERROR
|
||||||
rules:
|
rules:
|
||||||
- changes:
|
|
||||||
- "*"
|
|
||||||
- scripts/*
|
|
||||||
- ci/**/*
|
|
||||||
# If this matches, it means the pipeline is running against either the main
|
# If this matches, it means the pipeline is running against either the main
|
||||||
# or a stable branch, so make it manual
|
# or a stable branch, so make it manual
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
when: manual
|
when: manual
|
||||||
|
- changes:
|
||||||
|
- "*"
|
||||||
|
- scripts/*
|
||||||
|
- ci/**/*
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- *build
|
- *build
|
||||||
@ -730,6 +730,8 @@ build documentation:
|
|||||||
needs:
|
needs:
|
||||||
- "trigger"
|
- "trigger"
|
||||||
rules:
|
rules:
|
||||||
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
|
when: never
|
||||||
- changes:
|
- changes:
|
||||||
- .gitlab-ci.yml
|
- .gitlab-ci.yml
|
||||||
- ci/gitlab/freedesktop_doc_importer.sh
|
- ci/gitlab/freedesktop_doc_importer.sh
|
||||||
@ -746,8 +748,6 @@ build documentation:
|
|||||||
- subprojects/gstreamer/**/*
|
- subprojects/gstreamer/**/*
|
||||||
- subprojects/gstreamer-vaapi/**/*
|
- subprojects/gstreamer-vaapi/**/*
|
||||||
- subprojects/gst-rtsp-server/**/*
|
- subprojects/gst-rtsp-server/**/*
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
|
||||||
when: never
|
|
||||||
|
|
||||||
# FIXME: Using trigger: causes permission issues, workaround using old REST API.
|
# FIXME: Using trigger: causes permission issues, workaround using old REST API.
|
||||||
# https://gitlab.com/gitlab-org/gitlab/-/issues/341737
|
# https://gitlab.com/gitlab-org/gitlab/-/issues/341737
|
||||||
@ -762,6 +762,8 @@ cerbero trigger:
|
|||||||
- ci/gitlab/trigger_cerbero_pipeline.py
|
- ci/gitlab/trigger_cerbero_pipeline.py
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
|
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
||||||
|
when: never
|
||||||
- changes:
|
- changes:
|
||||||
- .gitlab-ci.yml
|
- .gitlab-ci.yml
|
||||||
- ci/gitlab/trigger_cerbero_pipeline.py
|
- ci/gitlab/trigger_cerbero_pipeline.py
|
||||||
@ -776,5 +778,3 @@ cerbero trigger:
|
|||||||
- subprojects/gstreamer/**/*
|
- subprojects/gstreamer/**/*
|
||||||
- subprojects/gst-rtsp-server/**/*
|
- subprojects/gst-rtsp-server/**/*
|
||||||
- subprojects/gst-examples/**/*
|
- subprojects/gst-examples/**/*
|
||||||
- if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
|
|
||||||
when: never
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user