FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ci_template: try to enable merge-request pipelines again

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

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/363>
This commit is contained in:
Jordan Petridis 2020-10-08 13:57:36 +03:00
parent 24db2ef9e7
commit ad370fecef
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gitlab/ci_template.yml
View File

@ -1,5 +1,5 @@
include: include:
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml' - template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
stages: stages:
- 'build docker' - 'build docker'
@ -329,12 +329,11 @@ manifest:
- if: '$CI_PROJECT_PATH == "gstreamer/cerbero"' - if: '$CI_PROJECT_PATH == "gstreamer/cerbero"'
- if: '$CI_PROJECT_PATH == "gstreamer/gst-docs"' - if: '$CI_PROJECT_PATH == "gstreamer/gst-docs"'
# If the user that triggered the Pipeline is the Merge bot and the branch doesn't match # If the MR is assigned to the Merge bot, trigger the pipeline automatically
# the upstream branch set, run the pipeline - if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"'
- if: '$GITLAB_USER_LOGIN == "gstreamer-merge-bot" && $CI_COMMIT_BRANCH != $GST_UPSTREAM_BRANCH' # When the assignee isn't the merge bot, require an explicit action to trigger the pipeline
# When the user isn't the merge bot, require an explicit action to trigger the pipeline
# to avoid wasting CI resources # to avoid wasting CI resources
- if: '$GITLAB_USER_LOGIN != "gstreamer-merge-bot"' - if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"'
when: 'manual' when: 'manual'
# 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
@ -880,7 +879,7 @@ build cerbero cross-android universal:
- '.cerbero' - '.cerbero'
- '.cerbero cross-android universal' - '.cerbero cross-android universal'
rules: 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)$/' - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
# #
@ -967,7 +966,7 @@ build cerbero cross win64:
cross-android universal examples: cross-android universal examples:
extends: ".cross-android universal examples" extends: ".cross-android universal examples"
rules: 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)$/' - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
needs: needs:
- "build cerbero cross-android universal" - "build cerbero cross-android universal"
@ -1046,7 +1045,7 @@ build cerbero cross-ios universal:
- '.cerbero' - '.cerbero'
- '.cerbero cross-ios universal' - '.cerbero cross-ios universal'
rules: 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)$/' - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gst-sharp|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
documentation: documentation:
@ -1147,7 +1146,7 @@ documentation:
cross-ios universal examples: cross-ios universal examples:
extends: ".cross-ios universal examples" extends: ".cross-ios universal examples"
rules: 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)$/' - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-docs|gst-omx|gstreamer-vaapi|gst-integration-testsuites|gst-plugins-rs)$/'
needs: needs:
- "build cerbero cross-ios universal" - "build cerbero cross-ios universal"