From 4c046c9e8af6488f68a7e068a34c4a7693c23ee9 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 12 Oct 2021 22:35:38 -0300 Subject: [PATCH] ci: Run tests post merge This will make tracking new races much easier Mark other jobs as manual when pipeline is running on master Part-of: --- .gitlab-ci.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bac16dc759..60a5bc0e7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,10 +118,8 @@ trigger: - if: '$CI_MERGE_REQUEST_ASSIGNEES != "gstreamer-merge-bot"' when: 'manual' allow_failure: false - # If this matches, it means the pipeline is running against either the main - # or a stable branch, so make it manual + # Alway run tests post merged - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' - when: 'manual' .fedora image: variables: @@ -345,6 +343,10 @@ gst indent: 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 build nodebug fedora x86_64: extends: @@ -393,6 +395,10 @@ build clang fedora x86_64: 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 before_script: - ci/scripts/handle-subprojects-cache.py subprojects/ script: @@ -542,6 +548,10 @@ gstreamer-full: - "*" - 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 script: - *build @@ -744,6 +754,8 @@ 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 @@ -772,3 +784,5 @@ cerbero trigger: - subprojects/gstreamer/**/* - subprojects/gst-rtsp-server/**/* - subprojects/gst-examples/**/* + - if: '$CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' + when: never