Commit 9930b687 authored by Jordan Petridіs's avatar Jordan Petridіs 🌱 Committed by Tim-Philipp Müller

ci_template: try to enable merge-request pipelines again

Gitlab was slightly bugged in previous version, and we
had to use branch-only pipelines. Let's try this again.

Part-of: <!366>
parent 42fdf87d
include:
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
stages:
- 'build docker'
......@@ -326,12 +326,11 @@ manifest:
- if: '$CI_PROJECT_PATH == "gstreamer/cerbero"'
- if: '$CI_PROJECT_PATH == "gstreamer/gst-docs"'
# If the user that triggered the Pipeline is the Merge bot and the branch doesn't match
# the upstream branch set, run the pipeline
- if: '$GITLAB_USER_LOGIN == "gstreamer-merge-bot" && $CI_COMMIT_BRANCH != $GST_UPSTREAM_BRANCH'
# When the user isn't the merge bot, require an explicit action to trigger the pipeline
# If the MR is assigned to the Merge bot, trigger the pipeline automatically
- if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"'
# When the assignee isn't the merge bot, require an explicit action to trigger the pipeline
# to avoid wasting CI resources
- if: '$GITLAB_USER_LOGIN != "gstreamer-merge-bot"'
- if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"'
when: 'manual'
# If this matches, it means the pipeline is running against either the main
# or a stable branch, so make it manual
......@@ -915,7 +914,7 @@ build cerbero cross-android universal:
- '.cerbero'
- '.cerbero cross-android universal'
rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_MERGE_REQUEST_IID && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
#
......@@ -1002,7 +1001,7 @@ build cerbero cross win64:
cross-android universal examples:
extends: ".cross-android universal examples"
rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_MERGE_REQUEST_IID && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
needs:
- "build cerbero cross-android universal"
......@@ -1081,7 +1080,7 @@ build cerbero cross-ios universal:
- '.cerbero'
- '.cerbero cross-ios universal'
rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_MERGE_REQUEST_IID && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gst-sharp|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
documentation:
......@@ -1182,7 +1181,7 @@ documentation:
cross-ios universal examples:
extends: ".cross-ios universal examples"
rules:
- if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_MERGE_REQUEST_IID && $CI_PROJECT_NAME == "gst-docs"'
- if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
needs:
- "build cerbero cross-ios universal"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment