From f1e93b5159a5e693be02418147369201e9909803 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Mar 2023 09:28:12 +1000 Subject: [PATCH] CI: add new workflow rules Required for pipelines to run after some infrastructure changes, see https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 Signed-off-by: Peter Hutterer --- .gitlab-ci.yml | 5 +++++ .gitlab-ci/ci.template | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc845226..0aa404b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,11 @@ include: # Ubuntu container builder template - '/templates/ubuntu.yml' +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'push' + stages: - sanity check # CI/commit checks - prep # prep work like rebuilding the container images if there is a change diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 64b49775..c527d270 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -48,6 +48,11 @@ include: - '/templates/{{distro.name}}.yml' {% endfor %} +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + - if: $CI_PIPELINE_SOURCE == 'push' + stages: - sanity check # CI/commit checks - prep # prep work like rebuilding the container images if there is a change -- 2.34.1