diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2021-10-13 18:00:13 -0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-10-14 13:42:21 +0000 |
| commit | eb839a8423c2b64341dc6ca2d287a8f67fccfa8e (patch) | |
| tree | 64d156597628d49681a61f06ec9155ee6b9bcead /.gitlab-ci.yml | |
| parent | 57bfb85bc598c7c5ca286c386a109e287bd97348 (diff) | |
| download | gstreamer-eb839a8423c2b64341dc6ca2d287a8f67fccfa8e.tar.gz | |
ci: Fix ordering of rules to always build on main
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1141>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbc727bd81..e235934c59 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,13 +113,13 @@ trigger: rules: # If the MR is assigned to the Merge bot, trigger the pipeline automatically - 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 # to avoid wasting CI resources - if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"' when: 'manual' allow_failure: false - # Alway run tests post merged - - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' .fedora image: variables: @@ -341,12 +341,12 @@ gst indent: variables: MESON_ARGS: *simple_build rules: - - changes: - *modules_changes # If this matches, it means the pipeline is running against either the main # or a stable branch, so make it manual - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' when: manual + - changes: + *modules_changes build nodebug fedora x86_64: extends: @@ -393,12 +393,12 @@ build clang fedora x86_64: -Dgst-plugins-base:pango=enabled -Dgst-plugins-good:cairo=enabled rules: - - changes: - *modules_changes # If this matches, it means the pipeline is running against either the main # or a stable branch, so make it manual - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' when: manual + - changes: + *modules_changes before_script: - ci/scripts/handle-subprojects-cache.py subprojects/ script: @@ -536,14 +536,14 @@ gstreamer-full: -Dintrospection=disabled $MESON_GST_WERROR rules: - - changes: - - "*" - - scripts/* - - ci/**/* # If this matches, it means the pipeline is running against either the main # or a stable branch, so make it manual - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' when: manual + - changes: + - "*" + - scripts/* + - ci/**/* script: - *build @@ -730,6 +730,8 @@ build documentation: needs: - "trigger" rules: + - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' + when: never - changes: - .gitlab-ci.yml - ci/gitlab/freedesktop_doc_importer.sh @@ -746,8 +748,6 @@ build documentation: - subprojects/gstreamer/**/* - subprojects/gstreamer-vaapi/**/* - subprojects/gst-rtsp-server/**/* - - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' - when: never # FIXME: Using trigger: causes permission issues, workaround using old REST API. # https://gitlab.com/gitlab-org/gitlab/-/issues/341737 @@ -762,6 +762,8 @@ cerbero trigger: - ci/gitlab/trigger_cerbero_pipeline.py rules: + - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' + when: never - changes: - .gitlab-ci.yml - ci/gitlab/trigger_cerbero_pipeline.py @@ -776,5 +778,3 @@ cerbero trigger: - subprojects/gstreamer/**/* - subprojects/gst-rtsp-server/**/* - subprojects/gst-examples/**/* - - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' - when: never |